From 2b5e48d80735be60c68023de114a586bbcc18360 Mon Sep 17 00:00:00 2001 From: Miran Date: Thu, 7 Mar 2019 00:49:39 +0100 Subject: move assertions and iterators out of system.nim (#10597) * move assertions and iterators out of system.nim * limit nimsuggest tests to the first 3 suggestions --- tests/assert/tfailedassert_stacktrace.nim | 6 +++--- tests/errmsgs/t9768.nim | 2 +- tests/manyloc/standalone/panicoverride.nim | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/assert/tfailedassert_stacktrace.nim b/tests/assert/tfailedassert_stacktrace.nim index 6505f189c..b5da3eb43 100644 --- a/tests/assert/tfailedassert_stacktrace.nim +++ b/tests/assert/tfailedassert_stacktrace.nim @@ -5,9 +5,9 @@ discard """ const expected = """ tfailedassert_stacktrace.nim(34) tfailedassert_stacktrace tfailedassert_stacktrace.nim(33) foo -system.nim(*) failedAssertImpl -system.nim(*) raiseAssert -system.nim(*) sysFatal""" +assertions.nim(*) failedAssertImpl +assertions.nim(*) raiseAssert +fatal.nim(*) sysFatal""" proc tmatch(x, p: string): bool = var i = 0 diff --git a/tests/errmsgs/t9768.nim b/tests/errmsgs/t9768.nim index 18588c87c..d369150a5 100644 --- a/tests/errmsgs/t9768.nim +++ b/tests/errmsgs/t9768.nim @@ -1,6 +1,6 @@ discard """ errmsg: "unhandled exception:" - file: "system.nim" + file: "system/fatal.nim" nimout: ''' stack trace: (most recent call last) t9768.nim(28, 33) main diff --git a/tests/manyloc/standalone/panicoverride.nim b/tests/manyloc/standalone/panicoverride.nim index 9d0d070c7..d9b3f4388 100644 --- a/tests/manyloc/standalone/panicoverride.nim +++ b/tests/manyloc/standalone/panicoverride.nim @@ -2,10 +2,6 @@ proc printf(frmt: cstring) {.varargs, importc, header: "", cdecl.} proc exit(code: int) {.importc, header: "", cdecl.} -proc nimToCStringConv(s: NimString): cstring {.compilerProc, inline.} = - if s == nil or s.len == 0: result = cstring"" - else: result = cstring(addr s.data) - {.push stack_trace: off, profiler:off.} proc rawoutput(s: string) = -- cgit 1.4.1-2-gfad0