From dd362ab4c0f574f781fb450b479d9dda8ced1e63 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 20 Mar 2020 01:28:03 -0700 Subject: fix #13538 sigmatch errors are now sorted (#13701) * fix #13538 sigmatch now sorted and has reliable order * re-enable tests that were disabled because of that bug * fix remaining tests and un-disable 2 other tests that were affected by this bug --- tests/errmsgs/tsigmatch.nim | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/errmsgs/tsigmatch.nim') diff --git a/tests/errmsgs/tsigmatch.nim b/tests/errmsgs/tsigmatch.nim index 6b85d1408..414c972c9 100644 --- a/tests/errmsgs/tsigmatch.nim +++ b/tests/errmsgs/tsigmatch.nim @@ -3,13 +3,13 @@ discard """ nimout: ''' tsigmatch.nim(111, 4) Error: type mismatch: got but expected one of: +proc f(a: A) + first type mismatch at position: 2 + extra argument given proc f(b: B) first type mismatch at position: 1 required type for b: B but expression 'A()' is of type: A -proc f(a: A) - first type mismatch at position: 2 - extra argument given expression: f(A(), "extra") tsigmatch.nim(125, 6) Error: type mismatch: got @@ -61,14 +61,14 @@ proc f(a1: string; a2: varargs[string]; a3: float; a4: var string) expression: f("asdf", "1", "2", "3", "4", 2.3, "bad") tsigmatch.nim(164, 4) Error: type mismatch: got but expected one of: -proc f(x: string; a0: var int) - first type mismatch at position: 2 - required type for a0: var int - but expression 'a0 = 12' is immutable, not 'var' proc f(x: string; a0: string) first type mismatch at position: 2 required type for a0: string but expression 'a0 = 12' is of type: int literal(12) +proc f(x: string; a0: var int) + first type mismatch at position: 2 + required type for a0: var int + but expression 'a0 = 12' is immutable, not 'var' expression: f(foo, a0 = 12) tsigmatch.nim(171, 7) Error: type mismatch: got -- cgit 1.4.1-2-gfad0