diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-08-19 15:14:03 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-08-19 15:14:03 +0200 |
| commit | 696c0c48c7c794453b79d2abf45c3f390a9b6fba (patch) | |
| tree | 8a74e09ce97f64ea0e3377f6440a2e79d54ce0fd /tests/notnil/tnotnil.nim | |
| parent | 7ac6462cbd30bcdb1c3805fbb06be13b3346ce2a (diff) | |
| parent | f2263cd129ff41259db99c68e98f966a681adf78 (diff) | |
| download | Nim-696c0c48c7c794453b79d2abf45c3f390a9b6fba.tar.gz | |
fixes merge conflict
Diffstat (limited to 'tests/notnil/tnotnil.nim')
| -rw-r--r-- | tests/notnil/tnotnil.nim | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/notnil/tnotnil.nim b/tests/notnil/tnotnil.nim index e392b155c..aff3f8959 100644 --- a/tests/notnil/tnotnil.nim +++ b/tests/notnil/tnotnil.nim @@ -1,5 +1,5 @@ discard """ - line: 22 + line: 13 errormsg: "type mismatch" """ {.experimental: "notnil".} @@ -8,16 +8,6 @@ type TObj = object x: int - MyString = string not nil - -#var x: PObj = nil - -proc p(x: string not nil): int = - result = 45 - -proc q(x: MyString) = discard proc q2(x: string) = discard q2(nil) -q(nil) - |