From b57d14b1ae5a9504cc08b5aca60bf5d721f3b1c9 Mon Sep 17 00:00:00 2001 From: Araq Date: Sat, 10 Feb 2018 20:55:05 +0100 Subject: [PATCH] make more tests green --- tests/bind/tinvalidbindtypedesc.nim | 2 +- tests/bind/tnicerrorforsymchoice.nim | 2 +- tests/casestmt/tcaseexpr1.nim | 2 +- tests/clearmsg/ta.nim | 2 +- tests/closure/tinvalidclosure.nim | 2 +- tests/constraints/tconstraints.nim | 2 +- tests/effects/tgcsafe2.nim | 2 +- tests/generics/tcannot_pass_empty_seq_to_generic.nim | 2 +- tests/generics/tparam_binding.nim | 2 +- tests/let/tlet2.nim | 2 +- tests/manyloc/argument_parser/argument_parser.nim | 2 +- tests/metatype/typeclassinference.nim | 2 +- tests/misc/tinc.nim | 2 +- tests/misc/tinout.nim | 2 +- tests/misc/tinvalidnewseq.nim | 2 +- tests/misc/tnolen.nim | 2 +- tests/misc/tsimtych.nim | 2 +- tests/namedparams/tnamedparams.nim | 2 +- tests/namedparams/tnamedparams3.nim | 2 +- tests/objvariant/tadrdisc.nim | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/bind/tinvalidbindtypedesc.nim b/tests/bind/tinvalidbindtypedesc.nim index 7704d2cb7..ecdd12603 100644 --- a/tests/bind/tinvalidbindtypedesc.nim +++ b/tests/bind/tinvalidbindtypedesc.nim @@ -1,6 +1,6 @@ discard """ line: 10 - errormsg: "type mismatch: got (type float, string)" + errormsg: "type mismatch: got " """ proc foo(T: typedesc; some: T) = diff --git a/tests/bind/tnicerrorforsymchoice.nim b/tests/bind/tnicerrorforsymchoice.nim index 1431720e0..8c3a99c97 100644 --- a/tests/bind/tnicerrorforsymchoice.nim +++ b/tests/bind/tnicerrorforsymchoice.nim @@ -1,6 +1,6 @@ discard """ line: 18 - errormsg: "type mismatch: got (proc (s: TScgi: ScgiState or AsyncScgiState) | proc (client: AsyncSocket, headers: StringTableRef, input: string){.noSideEffect, gcsafe, locks: 0.}" + errormsg: "type mismatch: got " """ #bug #442 diff --git a/tests/casestmt/tcaseexpr1.nim b/tests/casestmt/tcaseexpr1.nim index 56acbbc8a..24543f1b8 100644 --- a/tests/casestmt/tcaseexpr1.nim +++ b/tests/casestmt/tcaseexpr1.nim @@ -2,7 +2,7 @@ discard """ file: "tcaseexpr1.nim" line: 29 - errormsg: "type mismatch: got (string) but expected 'int'" + errormsg: "type mismatch: got but expected 'int'" line: 23 errormsg: "not all cases are covered" diff --git a/tests/clearmsg/ta.nim b/tests/clearmsg/ta.nim index 38449c319..31baae773 100644 --- a/tests/clearmsg/ta.nim +++ b/tests/clearmsg/ta.nim @@ -1,5 +1,5 @@ discard """ - errormsg: "type mismatch: got (mc.typ)" + errormsg: "type mismatch: got " line: 12 """ diff --git a/tests/closure/tinvalidclosure.nim b/tests/closure/tinvalidclosure.nim index d3f38cde5..4e5f61f06 100644 --- a/tests/closure/tinvalidclosure.nim +++ b/tests/closure/tinvalidclosure.nim @@ -1,6 +1,6 @@ discard """ line: 12 - errormsg: "type mismatch: got (proc (x: int){.gcsafe, locks: 0.})" + errormsg: "type mismatch: got " """ proc ugh[T](x: T) {.nimcall.} = diff --git a/tests/constraints/tconstraints.nim b/tests/constraints/tconstraints.nim index ea3f68fd4..3c9fdc354 100644 --- a/tests/constraints/tconstraints.nim +++ b/tests/constraints/tconstraints.nim @@ -1,6 +1,6 @@ discard """ line: 16 - errormsg: "type mismatch: got (int literal(232))" + errormsg: "type mismatch: got " """ proc myGenericProc[T: object|tuple|ptr|ref|distinct](x: T): string = diff --git a/tests/effects/tgcsafe2.nim b/tests/effects/tgcsafe2.nim index 0b2c090a7..07da4e3f8 100644 --- a/tests/effects/tgcsafe2.nim +++ b/tests/effects/tgcsafe2.nim @@ -1,5 +1,5 @@ discard """ - errormsg: '''type mismatch: got (proc (s: string){.locks: 0.})''' + errormsg: '''type mismatch: got ''' line: 11 """ #5620 diff --git a/tests/generics/tcannot_pass_empty_seq_to_generic.nim b/tests/generics/tcannot_pass_empty_seq_to_generic.nim index 5f0363af8..e33dbc10b 100644 --- a/tests/generics/tcannot_pass_empty_seq_to_generic.nim +++ b/tests/generics/tcannot_pass_empty_seq_to_generic.nim @@ -1,5 +1,5 @@ discard """ - errormsg: "type mismatch: got (seq[empty])" + errormsg: "type mismatch: got " line: 16 """ diff --git a/tests/generics/tparam_binding.nim b/tests/generics/tparam_binding.nim index 643e9b226..55acb8f06 100644 --- a/tests/generics/tparam_binding.nim +++ b/tests/generics/tparam_binding.nim @@ -1,5 +1,5 @@ discard """ - errormsg: "got (ref Matrix[2, 2, system.float], ref Matrix[2, 1, system.float])" + errormsg: "got " line: 27 """ diff --git a/tests/let/tlet2.nim b/tests/let/tlet2.nim index 66dd5a55b..2df15fa5c 100644 --- a/tests/let/tlet2.nim +++ b/tests/let/tlet2.nim @@ -1,6 +1,6 @@ discard """ line: "13" - errormsg: "type mismatch: got (int literal(8), int literal(5), int, int)" + errormsg: "type mismatch: got " """ proc divmod(a, b: int, res, remainder: var int) = diff --git a/tests/manyloc/argument_parser/argument_parser.nim b/tests/manyloc/argument_parser/argument_parser.nim index 97de552e3..14352066d 100644 --- a/tests/manyloc/argument_parser/argument_parser.nim +++ b/tests/manyloc/argument_parser/argument_parser.nim @@ -174,7 +174,7 @@ template new_parsed_parameter*(tkind: Tparam_kind, expr): Tparsed_parameter = ## parsed_param1 = new_parsed_parameter(PK_FLOAT, 3.41) ## parsed_param2 = new_parsed_parameter(PK_BIGGEST_INT, 2358123 * 23123) ## # The following line doesn't compile due to - ## # type mismatch: got (string) but expected 'int' + ## # type mismatch: got but expected 'int' ## #parsed_param3 = new_parsed_parameter(PK_INT, "231") var result {.gensym.}: Tparsed_parameter result.kind = tkind diff --git a/tests/metatype/typeclassinference.nim b/tests/metatype/typeclassinference.nim index fd2d307a9..8b99eb501 100644 --- a/tests/metatype/typeclassinference.nim +++ b/tests/metatype/typeclassinference.nim @@ -1,5 +1,5 @@ discard """ - errormsg: "type mismatch: got (string) but expected 'ptr'" + errormsg: "type mismatch: got but expected 'ptr'" line: 20 disabled: true """ diff --git a/tests/misc/tinc.nim b/tests/misc/tinc.nim index b74f85591..7819775e3 100644 --- a/tests/misc/tinc.nim +++ b/tests/misc/tinc.nim @@ -1,7 +1,7 @@ discard """ file: "tinc.nim" line: 8 - errormsg: "type mismatch: got (int)" + errormsg: "type mismatch: got " """ var x = 0 diff --git a/tests/misc/tinout.nim b/tests/misc/tinout.nim index 0b2a54d9f..46af2f5de 100644 --- a/tests/misc/tinout.nim +++ b/tests/misc/tinout.nim @@ -1,7 +1,7 @@ discard """ file: "tinout.nim" line: 12 - errormsg: "type mismatch: got (int literal(3))" + errormsg: "type mismatch: got " """ # Test in out checking for parameters diff --git a/tests/misc/tinvalidnewseq.nim b/tests/misc/tinvalidnewseq.nim index 89083d8b2..66e9388ef 100644 --- a/tests/misc/tinvalidnewseq.nim +++ b/tests/misc/tinvalidnewseq.nim @@ -1,7 +1,7 @@ discard """ file: "tinvalidnewseq.nim" line: 15 - errormsg: "type mismatch: got (array[0..6, string], int literal(7))" + errormsg: "type mismatch: got " """ import re, strutils diff --git a/tests/misc/tnolen.nim b/tests/misc/tnolen.nim index dcf6811eb..2831e5048 100644 --- a/tests/misc/tnolen.nim +++ b/tests/misc/tnolen.nim @@ -1,6 +1,6 @@ discard """ line: 8 - errormsg: "type mismatch: got (int literal(3))" + errormsg: "type mismatch: got " """ # please finally disallow Len(3) diff --git a/tests/misc/tsimtych.nim b/tests/misc/tsimtych.nim index 27a922f6a..037172bd5 100644 --- a/tests/misc/tsimtych.nim +++ b/tests/misc/tsimtych.nim @@ -1,7 +1,7 @@ discard """ file: "tsimtych.nim" line: 10 - errormsg: "type mismatch: got (bool) but expected \'string\'" + errormsg: "type mismatch: got but expected \'string\'" """ # Test 2 # Simple type checking diff --git a/tests/namedparams/tnamedparams.nim b/tests/namedparams/tnamedparams.nim index 9a8bd0c2e..8799e8a15 100644 --- a/tests/namedparams/tnamedparams.nim +++ b/tests/namedparams/tnamedparams.nim @@ -1,7 +1,7 @@ discard """ file: "tnamedparams.nim" line: 8 - errormsg: "type mismatch: got (input: string, filename: string, line: int literal(1), col: int literal(23))" + errormsg: "type mismatch: got " """ import pegs diff --git a/tests/namedparams/tnamedparams3.nim b/tests/namedparams/tnamedparams3.nim index d9c79bf98..e736c338c 100644 --- a/tests/namedparams/tnamedparams3.nim +++ b/tests/namedparams/tnamedparams3.nim @@ -1,5 +1,5 @@ discard """ - errormsg: "type mismatch: got (int literal(5), b: bool)" + errormsg: "type mismatch: got " line: 10 """ diff --git a/tests/objvariant/tadrdisc.nim b/tests/objvariant/tadrdisc.nim index 1afe7d04f..258fb42f3 100644 --- a/tests/objvariant/tadrdisc.nim +++ b/tests/objvariant/tadrdisc.nim @@ -1,7 +1,7 @@ discard """ file: "tadrdisc.nim" line: 20 - errormsg: "type mismatch: got (TKind)" + errormsg: "type mismatch: got " """ # Test that the address of a dicriminants cannot be taken