diff options
author | Araq <rumpf_a@web.de> | 2018-02-10 20:39:05 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2018-02-10 20:55:21 +0100 |
commit | ef6eda4cb4b28a6c4a2706ea56240bc708e36349 (patch) | |
tree | 9f7596b6a4127d40a146d56bfb25a1f345e2fd8e /tests/errmsgs | |
parent | 51d81c4e23c7f5513a1b2028f02509c860021278 (diff) | |
download | Nim-ef6eda4cb4b28a6c4a2706ea56240bc708e36349.tar.gz |
better error messages: use <T1, T2> instead of (T1, T2) in order to prevent confusions with tuple types
Diffstat (limited to 'tests/errmsgs')
-rw-r--r-- | tests/errmsgs/t4756.nim | 2 | ||||
-rw-r--r-- | tests/errmsgs/t5167_4.nim | 2 | ||||
-rw-r--r-- | tests/errmsgs/tconceptconstraint.nim | 6 | ||||
-rw-r--r-- | tests/errmsgs/tdetailed_position.nim | 8 | ||||
-rw-r--r-- | tests/errmsgs/tgenericconstraint.nim | 4 | ||||
-rw-r--r-- | tests/errmsgs/tmake_tuple_visible.nim | 4 | ||||
-rw-r--r-- | tests/errmsgs/tshow_asgn.nim | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/tests/errmsgs/t4756.nim b/tests/errmsgs/t4756.nim index 91fc90f4b..262614ba0 100644 --- a/tests/errmsgs/t4756.nim +++ b/tests/errmsgs/t4756.nim @@ -1,5 +1,5 @@ discard """ -errormsg: "type mismatch: got (string, arr: seq[empty])" +errormsg: "type mismatch: got <string, arr: seq[empty]>" line: 15 """ diff --git a/tests/errmsgs/t5167_4.nim b/tests/errmsgs/t5167_4.nim index 3d77fae02..7a263622b 100644 --- a/tests/errmsgs/t5167_4.nim +++ b/tests/errmsgs/t5167_4.nim @@ -1,5 +1,5 @@ discard """ -errormsg: "type mismatch: got (proc [*missing parameters*](x: int) | proc (x: string){.gcsafe, locks: 0.})" +errormsg: "type mismatch: got <proc [*missing parameters*](x: int) | proc (x: string){.gcsafe, locks: 0.}>" line: 19 """ diff --git a/tests/errmsgs/tconceptconstraint.nim b/tests/errmsgs/tconceptconstraint.nim index c1f0b94eb..9ab1708c7 100644 --- a/tests/errmsgs/tconceptconstraint.nim +++ b/tests/errmsgs/tconceptconstraint.nim @@ -2,15 +2,15 @@ discard """ errormsg: "cannot instantiate B" line: 20 nimout: ''' -got: (type string) -but expected: (T: A) +got: <type string> +but expected: <T: A> ''' """ type A = concept c advance(c) - + B[T: A] = object child: ref B[T] diff --git a/tests/errmsgs/tdetailed_position.nim b/tests/errmsgs/tdetailed_position.nim index d6db94c3e..ce5b18bbd 100644 --- a/tests/errmsgs/tdetailed_position.nim +++ b/tests/errmsgs/tdetailed_position.nim @@ -1,13 +1,13 @@ discard """ cmd: "nim check $file" -errormsg: "type mismatch: got (int literal(1), int literal(2), int literal(3))" +errormsg: "type mismatch: got <int literal(1), int literal(2), int literal(3)>" nimout: ''' but expected one of: proc main(a, b, c: string) -first type mismatch at position: 1 -required type: string -but expression '1' is of type: int literal(1) + first type mismatch at position: 1 + required type: string + but expression '1' is of type: int literal(1) expression: main(1, 2, 3) ''' diff --git a/tests/errmsgs/tgenericconstraint.nim b/tests/errmsgs/tgenericconstraint.nim index 9129d257b..e3093fead 100644 --- a/tests/errmsgs/tgenericconstraint.nim +++ b/tests/errmsgs/tgenericconstraint.nim @@ -2,8 +2,8 @@ discard """ errormsg: "cannot instantiate B" line: 14 nimout: ''' -got: (type int) -but expected: (T: string or float) +got: <type int> +but expected: <T: string or float> ''' """ diff --git a/tests/errmsgs/tmake_tuple_visible.nim b/tests/errmsgs/tmake_tuple_visible.nim index 43337c2a9..e059368ad 100644 --- a/tests/errmsgs/tmake_tuple_visible.nim +++ b/tests/errmsgs/tmake_tuple_visible.nim @@ -1,7 +1,7 @@ discard """ - errormsg: '''got (tuple of (type NimEdAppWindow, int))''' + errormsg: '''got <tuple of (type NimEdAppWindow, int)>''' line: 22 - nimout: '''got (tuple of (type NimEdAppWindow, int)) + nimout: '''got <tuple of (type NimEdAppWindow, int)> but expected one of: template xxx(tn: typedesc; i: int)''' """ diff --git a/tests/errmsgs/tshow_asgn.nim b/tests/errmsgs/tshow_asgn.nim index 250f786e2..1627c9b71 100644 --- a/tests/errmsgs/tshow_asgn.nim +++ b/tests/errmsgs/tshow_asgn.nim @@ -1,5 +1,5 @@ discard """ - errormsg: "type mismatch: got (int) but expected 'cshort = int16'" + errormsg: "type mismatch: got <int> but expected 'cshort = int16'" line: 12 column: 10 file: "tshow_asgn.nim" |