Skip to content

Commit 31a8cf1

Browse files
authored
testament spec: remove errmsg alias of errormsg (#16188)
1 parent 6114df3 commit 31a8cf1

14 files changed

+14
-14
lines changed

testament/specs.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ proc parseSpec*(filename: string): TSpec =
306306
result.msg = e.value
307307
if result.action != actionRun:
308308
result.action = actionCompile
309-
of "errormsg", "errmsg": # xxx just use errormsg, no need for such aliases
309+
of "errormsg":
310310
result.msg = e.value
311311
result.action = actionReject
312312
of "nimout":

testament/tests/shouldfail/tfile.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "undeclared identifier: 'undefined'"
2+
errormsg: "undeclared identifier: 'undefined'"
33
file: "notthisfile.nim"
44
"""
55

tests/async/tdiscardableproc.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "Cannot make async proc discardable. Futures have to be checked with `asyncCheck` instead of discarded"
2+
errormsg: "Cannot make async proc discardable. Futures have to be checked with `asyncCheck` instead of discarded"
33
"""
44

55
import async

tests/destructor/tdestructor_too_late.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "cannot bind another '=destroy' to: Obj; previous declaration was constructed here implicitly: tdestructor_too_late.nim(7, 16)"
2+
errormsg: "cannot bind another '=destroy' to: Obj; previous declaration was constructed here implicitly: tdestructor_too_late.nim(7, 16)"
33
"""
44
type Obj* = object
55
v*: int

tests/errmsgs/t8610.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "invalid type: 'type int' for const"
2+
errormsg: "invalid type: 'type int' for const"
33
"""
44
## issue #8610
55
const Foo = int

tests/errmsgs/t9768.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "unhandled exception:"
2+
errormsg: "unhandled exception:"
33
file: "system/fatal.nim"
44
nimout: '''
55
stack trace: (most recent call last)

tests/errmsgs/tstaticexprscope.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "undeclared identifier: 'z'"
2+
errormsg: "undeclared identifier: 'z'"
33
line: 11
44
"""
55

tests/errmsgs/ttypeAllowed.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
discard """
22
cmd: "nim check $file"
3-
errmsg: ""
3+
errormsg: ""
44
nimout: '''
55
ttypeAllowed.nim(13, 5) Error: invalid type: 'iterator (a: int, b: int, step: Positive): int{.inline, noSideEffect, gcsafe, locks: 0.}' for let
66
ttypeAllowed.nim(17, 7) Error: invalid type: 'iterator (a: int, b: int, step: Positive): int{.inline, noSideEffect, gcsafe, locks: 0.}' for const

tests/lent/tnot_allowed_lent.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "expression has no address"
2+
errormsg: "expression has no address"
33
"""
44
type
55
MyObject = object

tests/lent/tnot_allowed_lent2.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "'x' cannot be assigned to"
2+
errormsg: "'x' cannot be assigned to"
33
line: 10
44
"""
55

tests/nimble/tnimblepathdollar_fault.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "cannot open file: pkgA/module"
2+
errormsg: "cannot open file: pkgA/module"
33
"""
44

55
# see nims file; comment out `switch("noNimblePath")` there and there would be no error

tests/proc/tfunc_type.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
discard """
3-
errmsg: "func keyword is not allowed in type descriptions, use proc with {.noSideEffect.} pragma instead"
3+
errormsg: "func keyword is not allowed in type descriptions, use proc with {.noSideEffect.} pragma instead"
44
"""
55

66
type

tests/proc/tillegalreturntype.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
discard """
22
cmd: "nim check $file"
3-
errmsg: ""
3+
errormsg: ""
44
nimout: '''
55
tillegalreturntype.nim(11, 11) Error: return type 'typed' is only valid for macros and templates
66
tillegalreturntype.nim(14, 11) Error: return type 'untyped' is only valid for macros and templates

tests/varres/tprevent_forloopvar_mutations.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
discard """
2-
errmsg: "type mismatch: got <int>"
2+
errormsg: "type mismatch: got <int>"
33
line: 17
44
nimout: '''type mismatch: got <int>
55
but expected one of:

0 commit comments

Comments
 (0)