make more standard libraries work with nimPreviewSlimSystem (#20343)

* make more standard libraries work with `nimPreviewSlimSystem`

* typo

* part two

* Delete specutils.nim

* fixes more tests

* more fixes

* fixes tests

* fixes three more tests

* add formatfloat import

* fix

* last

lib/core/typeinfo.nim

@@ -40,6 +40,10 @@ include "system/hti.nim"
 
 {.pop.}
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
+
 type
   AnyKind* = enum       ## The kind of `Any`.
     akNone = 0,         ## invalid

lib/experimental/diff.nim

@@ -45,6 +45,9 @@ jkl"""
 
 import tables, strutils
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 type
   Item* = object    ## An Item in the list of differences.
     startA*: int    ## Start Line number in Data A.

lib/impure/db_sqlite.nim

@@ -172,6 +172,8 @@ import db_common
 export db_common
 
 import std/private/[since, dbutils]
+when defined(nimPreviewSlimSystem):
+  import std/assertions
 
 type
   DbConn* = PSqlite3  ## Encapsulates a database connection.

lib/impure/nre.nim

@@ -66,6 +66,9 @@ from strutils import `%`
 import options
 from unicode import runeLenAt
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 export options
 
 type

lib/impure/re.nim

@@ -34,6 +34,9 @@ runnableExamples:
 import
   pcre, strutils, rtarrays
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 const
   MaxSubpatterns* = 20
     ## defines the maximum number of subpatterns that can be captured.

lib/pure/asyncdispatch.nim

@@ -232,6 +232,9 @@ import asyncfutures except callSoon
 
 import nativesockets, net, deques
 
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, syncio]
+
 export Port, SocketFlag
 export asyncfutures except callSoon
 export asyncstreams

lib/pure/asyncfile.nim

@@ -24,6 +24,9 @@
 
 import asyncdispatch, os
 
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, syncio]
+
 # TODO: Fix duplication introduced by PR #4683.
 
 when defined(windows) or defined(nimdoc):

lib/pure/asyncftpclient.nim

@@ -81,6 +81,9 @@
 import asyncdispatch, asyncnet, nativesockets, strutils, parseutils, os, times
 from net import BufferSize
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 type
   AsyncFtpClient* = ref object
     csock*: AsyncSocket

lib/pure/asyncfutures.nim

@@ -13,6 +13,7 @@ import system/stacktraces
 
 when defined(nimPreviewSlimSystem):
   import std/objectdollar # for StackTraceEntry
+  import std/assertions
 
 # TODO: This shouldn't need to be included, but should ideally be exported.
 type

lib/pure/asynchttpserver.nim

@@ -44,6 +44,9 @@ import httpcore
 from nativesockets import getLocalAddr, Domain, AF_INET, AF_INET6
 import std/private/since
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 export httpcore except parseHeader
 
 const

lib/pure/asyncnet.nim

@@ -96,6 +96,10 @@
 ##
 
 import std/private/since
+
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, syncio]
+
 import asyncdispatch, nativesockets, net, os
 
 export SOBool

lib/pure/asyncstreams.nim

@@ -11,6 +11,9 @@
 
 import asyncfutures
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 import deques
 
 type

lib/pure/cgi.nim

@@ -32,6 +32,9 @@
 import strutils, os, strtabs, cookies, uri
 export uri.encodeUrl, uri.decodeUrl
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 
 proc addXmlChar(dest: var string, c: char) {.inline.} =
   case c

lib/pure/collections/critbits.nim

@@ -36,6 +36,9 @@ runnableExamples:
 
 import std/private/since
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 type
   NodeObj[T] {.acyclic.} = object
     byte: int ## byte index of the difference

lib/pure/concurrency/cpuload.nim

@@ -19,6 +19,9 @@ when defined(windows):
 elif defined(linux):
   from cpuinfo import countProcessors
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 type
   ThreadPoolAdvice* = enum
     doNothing,

lib/pure/concurrency/threadpool.nim

@@ -23,6 +23,9 @@ when not compileOption("threads"):
 
 import cpuinfo, cpuload, locks, os
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 {.push stackTrace:off.}
 
 type

lib/pure/cookies.nim

@@ -11,6 +11,9 @@
 
 import strtabs, times, options
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 
 type
   SameSite* {.pure.} = enum ## The SameSite cookie attribute.

lib/pure/encodings.nim

@@ -40,6 +40,8 @@ runnableExamples:
 
 
 import os
+when defined(nimPreviewSlimSystem):
+  import std/assertions
 
 when not defined(windows):
   type

lib/pure/httpclient.nim

@@ -237,6 +237,9 @@ import std/[
   asyncnet, asyncdispatch, asyncfile, nativesockets,
 ]
 
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, syncio]
+
 export httpcore except parseHeader # TODO: The `except` doesn't work
 
 type

lib/pure/marshal.nim

@@ -56,6 +56,9 @@ Please contribute a new implementation.""".}
 
 import streams, typeinfo, json, intsets, tables, unicode
 
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, formatfloat]
+
 proc ptrToInt(x: pointer): int {.inline.} =
   result = cast[int](x) # don't skip alignment
 

lib/pure/memfiles.nim

@@ -24,6 +24,10 @@ else:
 
 import os, streams
 
+when defined(nimPreviewSlimSystem):
+  import std/[syncio, assertions]
+
+
 proc newEIO(msg: string): ref IOError =
   new(result)
   result.msg = msg

lib/pure/mimetypes.nim

@@ -29,6 +29,10 @@ runnableExamples:
 import tables
 from strutils import startsWith, toLowerAscii, strip
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
+
 type
   MimeDB* = object
     mimes: OrderedTable[string, string]

lib/pure/nativesockets.nim

@@ -16,6 +16,8 @@ import os, options
 import std/private/since
 import std/strbasics
 
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, syncio]
 
 when hostOS == "solaris":
   {.passl: "-lsocket -lnsl".}

lib/pure/net.nim

@@ -90,6 +90,9 @@ runnableExamples("-r:off"):
 
 import std/private/since
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 import nativesockets
 import os, strutils, times, sets, options, std/monotimes
 import ssl_config

lib/pure/parsesql.nim

@@ -15,6 +15,9 @@
 import strutils, lexbase
 import std/private/decode_helpers
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 # ------------------- scanner -------------------------------------------------
 
 type

lib/pure/parsexml.nim

@@ -149,6 +149,9 @@ an HTML document contains.
 import
   strutils, lexbase, streams, unicode
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 # the parser treats ``<br />`` as ``<br></br>``
 
 #  xmlElementCloseEnd, ## ``/>``

lib/pure/random.nim

@@ -75,6 +75,9 @@ runnableExamples:
 import algorithm, math
 import std/private/since
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 include system/inclrtl
 {.push debugger: off.}
 

lib/pure/rationals.nim

@@ -22,6 +22,8 @@ runnableExamples:
   doAssert r1 / r2 == -2 // 3
 
 import math, hashes
+when defined(nimPreviewSlimSystem):
+  import std/assertions
 
 type Rational*[T] = object
   ## A rational number, consisting of a numerator `num` and a denominator `den`.

lib/pure/ropes.nim

@@ -20,7 +20,7 @@ include system/inclrtl
 import streams
 
 when defined(nimPreviewSlimSystem):
-  import std/syncio
+  import std/[syncio, formatfloat, assertions]
 
 {.push debugger: off.} # the user does not want to trace a part
                        # of the standard library!

lib/pure/selectors.nim

@@ -29,6 +29,9 @@
 
 import os, nativesockets
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 const hasThreadSupport = compileOption("threads") and defined(threadsafe)
 
 const ioselSupportedPlatform* = defined(macosx) or defined(freebsd) or

lib/pure/stats.nim

@@ -55,6 +55,9 @@ runnableExamples:
 
 from math import FloatClass, sqrt, pow, round
 
+when defined(nimPreviewSlimSystem):
+  import std/[assertions, formatfloat]
+
 {.push debugger: off.} # the user does not want to trace a part
                        # of the standard library!
 {.push checks: off, line_dir: off, stack_trace: off.}

lib/pure/unittest.nim

@@ -108,6 +108,9 @@
 import std/private/since
 import std/exitprocs
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 import macros, strutils, streams, times, sets, sequtils
 
 when declared(stdout):

lib/std/jsbigints.nim

@@ -3,6 +3,9 @@
 when not defined(js):
   {.fatal: "Module jsbigints is designed to be used with the JavaScript backend.".}
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 type JsBigIntImpl {.importjs: "bigint".} = int # https://github.com/nim-lang/Nim/pull/16606
 type JsBigInt* = distinct JsBigIntImpl         ## Arbitrary precision integer for JavaScript target.
 

lib/std/sysrand.nim

@@ -62,6 +62,9 @@ when not defined(js):
 when defined(posix):
   import posix
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 const
   batchImplOS = defined(freebsd) or defined(openbsd) or defined(zephyr) or (defined(macosx) and not defined(ios))
   batchSize {.used.} = 256

lib/std/tasks.nim

@@ -13,6 +13,9 @@
 import std/[macros, isolation, typetraits]
 import system/ansi_c
 
+when defined(nimPreviewSlimSystem):
+  import std/assertions
+
 export isolation
 
 

lib/std/tempfiles.nim

@@ -19,6 +19,8 @@ See also:
 
 import os, random
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
 
 const
   maxRetry = 10000

lib/system/reprjs.nim

@@ -8,6 +8,9 @@
 #
 # The generic ``repr`` procedure for the javascript backend.
 
+when defined(nimPreviewSlimSystem):
+  import std/formatfloat
+
 proc reprInt(x: int64): string {.compilerproc.} = $x
 proc reprFloat(x: float): string {.compilerproc.} = $x
 

lib/wrappers/openssl.nim

@@ -25,6 +25,9 @@
 #
 from strutils import startsWith
 
+when defined(nimPreviewSlimSystem):
+  import std/syncio
+
 when defined(nimHasStyleChecks):
   {.push styleChecks: off.}
 

testament/lib/stdtest/specialpaths.nim

@@ -13,6 +13,8 @@ import compiler/nimpaths
 ]#
 
 import os
+when defined(nimPreviewSlimSystem):
+  import std/assertions
 
 # Note: all the const paths defined here are known at compile time and valid
 # so long Nim repo isn't relocated after compilation.

testament/lib/stdtest/unittest_light.nim

@@ -1,3 +1,6 @@
+import std/assertions
+
+
 proc mismatch*[T](lhs: T, rhs: T): string =
   ## Simplified version of `unittest.require` that satisfies a common use case,
   ## while avoiding pulling too many dependencies. On failure, diagnostic

tests/stdlib/concurrency/tatomics.nim

@@ -1,6 +1,8 @@
 # test atomic operations
 
 import std/[atomics, bitops]
+import std/assertions
+
 
 type
   Object = object

tests/stdlib/concurrency/tatomics_size.nim

@@ -2,6 +2,7 @@ discard """
   targets: "c cpp"
 """
 import std/atomics
+import std/assertions
 
 block testSize: # issue 12726
   type

tests/stdlib/config.nims

@@ -1,2 +1,3 @@
 switch("styleCheck", "usages")
-switch("styleCheck", "error")
+switch("styleCheck", "error")
+switch("define", "nimPreviewSlimSystem")

tests/stdlib/mintsets.nim

@@ -1,4 +1,5 @@
 import std/intsets
+import std/assertions
 
 proc test1*[]() =
   let a = initIntSet()

tests/stdlib/t10231.nim

@@ -5,6 +5,7 @@ discard """
 """
 
 import os
+import std/assertions
 
 # consider moving this inside tosproc (taking care that it's for cpp mode)
 

tests/stdlib/t14139.nim

@@ -1,4 +1,5 @@
-import heapqueue
+import std/heapqueue
+import std/assertions
 
 var test_queue : HeapQueue[int]
 

tests/stdlib/t7686.nim

@@ -1,4 +1,5 @@
-import strutils
+import std/strutils
+import std/assertions
 
 type
   MyEnum = enum

tests/stdlib/talgorithm.nim

@@ -6,6 +6,7 @@ discard """
 #12928,10456
 
 import std/[sequtils, algorithm, json, sugar]
+import std/assertions
 
 proc test() = 
   try: 

tests/stdlib/tarithmetics.nim

@@ -1,7 +1,7 @@
 discard """
   targets: "c cpp js"
 """
-
+import std/assertions
 # TODO: in future work move existing arithmetic tests (tests/arithm/*) into this file
 # FYI https://github.com/nim-lang/Nim/pull/17767
 

tests/stdlib/tasynchttpserver.nim

@@ -7,6 +7,7 @@ discard """
 
 import strutils
 from net import TimeoutError
+import std/assertions
 
 import httpclient, asynchttpserver, asyncdispatch, asyncfutures
 

tests/stdlib/tasynchttpserver_transferencoding.nim

@@ -8,6 +8,7 @@ import net
 
 import std/asyncnet
 import std/nativesockets
+import std/assertions
 
 const postBegin = """
 POST / HTTP/1.1

tests/stdlib/tbase64.nim

@@ -1,7 +1,7 @@
 discard """
   targets: "c js"
 """
-
+import std/assertions
 import std/base64
 
 template main() =

tests/stdlib/tbitops.nim

@@ -5,6 +5,7 @@ OK
 '''
 """
 import bitops
+import std/assertions
 
 proc main() =
   const U8 = 0b0011_0010'u8

tests/stdlib/tbitops_utils.nim

@@ -1,4 +1,5 @@
 import std/private/bitops_utils
+import std/assertions
 
 template chk(a, b) =
   let a2 = castToUnsigned(a)

tests/stdlib/tcgi.nim

@@ -1,5 +1,6 @@
 import std/unittest
 import std/[cgi, strtabs, sugar]
+import std/assertions
 
 block: # Test cgi module
   const queryString = "foo=bar&фу=бар&checked=✓&list=1,2,3&with_space=text%20with%20space"

tests/stdlib/tcmdline.nim

@@ -4,6 +4,7 @@ discard """
 """
 
 import std/os
+import std/assertions
 
 var params = paramCount()
 doAssert params == 0

tests/stdlib/tcomplex.nim

@@ -1,5 +1,5 @@
 import std/[complex, math]
-
+import std/assertions
 
 proc `=~`[T](x, y: Complex[T]): bool =
   result = abs(x.re-y.re) < 1e-6 and abs(x.im-y.im) < 1e-6

tests/stdlib/tcookies.nim

@@ -4,6 +4,7 @@ discard """
 
 
 import std/[cookies, times, strtabs]
+import std/assertions
 
 let expire = fromUnix(0) + 1.seconds
 

tests/stdlib/tcritbits.nim

@@ -3,6 +3,7 @@ discard """
 """
 
 import std/[sequtils,critbits]
+import std/assertions
 
 template main =
   var r: CritBitTree[void]

tests/stdlib/tcstring.nim

@@ -5,6 +5,7 @@ discard """
 
 from std/sugar import collect
 from stdtest/testutils import whenRuntimeJs, whenVMorJs
+import std/assertions
 
 template testMitems() =
   block:

tests/stdlib/tcstrutils.nim

@@ -3,7 +3,7 @@ discard """
 """
 
 import std/cstrutils
-
+import std/assertions
 
 proc main() =
   let s = cstring "abcdef"

tests/stdlib/tdb_mysql.nim

@@ -1,4 +1,5 @@
 import std/db_mysql
+import std/assertions
 
 doAssert dbQuote("SELECT * FROM foo WHERE col1 = 'bar_baz'") == "'SELECT * FROM foo WHERE col1 = \\'bar_baz\\''"
 doAssert dbQuote("SELECT * FROM foo WHERE col1 LIKE '%bar_baz%'") == "'SELECT * FROM foo WHERE col1 LIKE \\'%bar_baz%\\''"

tests/stdlib/tdecls.nim

@@ -1,7 +1,7 @@
 discard """
   targets: "c cpp js"
 """
-
+import std/assertions
 import std/decls
 
 template fun() =

tests/stdlib/tdecode_helpers.nim

@@ -1,5 +1,5 @@
 import std/private/decode_helpers
-
+import std/assertions
 
 block:
   var i = 0

tests/stdlib/tdeques.nim

@@ -5,7 +5,7 @@ discard """
 
 import std/deques
 from std/sequtils import toSeq
-
+import std/assertions
 
 block:
   proc index(self: Deque[int], idx: Natural): int =

tests/stdlib/tdiff.nim

@@ -4,6 +4,7 @@ discard """
 
 import experimental/diff
 import std/strutils
+import std/assertions
 
 proc testHelper(f: seq[Item]): string =
   for it in f:

tests/stdlib/tdochelpers.nim

@@ -9,6 +9,7 @@ discard """
 
 import ../../lib/packages/docutils/[rstast, rst, dochelpers]
 import unittest
+import std/assertions
 
 proc testMsgHandler(filename: string, line, col: int, msgkind: MsgKind,
                     arg: string) =

tests/stdlib/teditdistance.nim

@@ -1,4 +1,5 @@
 import std/editdistance
+import std/assertions
 
 doAssert editDistance("", "") == 0
 doAssert editDistance("kitten", "sitting") == 3 # from Wikipedia

tests/stdlib/tencodings.nim

@@ -1,4 +1,5 @@
 import std/encodings
+import std/assertions
 
 var fromGBK = open("utf-8", "gbk")
 var toGBK = open("gbk", "utf-8")

tests/stdlib/tenumerate.nim

@@ -1,4 +1,5 @@
 import std/enumerate
+import std/assertions
 
 let a = @[1, 3, 5, 7]
 

tests/stdlib/tenumutils.nim

@@ -4,6 +4,7 @@ discard """
 
 import std/enumutils
 from std/sequtils import toSeq
+import std/assertions
 
 template main =
   block: # items

tests/stdlib/tenvvars.nim

@@ -7,6 +7,7 @@ discard """
 import std/envvars
 from std/sequtils import toSeq
 import stdtest/testutils
+import std/assertions
 
 # "LATIN CAPITAL LETTER AE" in UTF-8 (0xc386)
 const unicodeUtf8 = "\xc3\x86"

tests/stdlib/tfdleak.nim

@@ -7,6 +7,9 @@ discard """
 
 import os, osproc, strutils, nativesockets, net, selectors, memfiles,
        asyncdispatch, asyncnet
+
+import std/[assertions, syncio]
+
 when defined(windows):
   import winlean
 
@@ -56,7 +59,7 @@ proc isValidHandle(f: int): bool =
 proc main() =
   if paramCount() == 0:
     # Parent process
-    let f = system.open("__test_fdleak", fmReadWrite)
+    let f = syncio.open("__test_fdleak", fmReadWrite)
     defer: close f
 
     leakCheck(f.getOsFileHandle, "system.open()")

tests/stdlib/tfdleak_multiple.nim

@@ -3,6 +3,7 @@ joinable: false
 """
 
 import os, osproc, strutils
+import std/assertions
 
 const Iterations = 200
 

tests/stdlib/tfenv.nim

@@ -1,4 +1,5 @@
 import std/fenv
+import std/assertions
 
 
 func is_significant(x: float): bool =

tests/stdlib/tfrexp1.nim

@@ -3,6 +3,7 @@ discard """
 """
 
 import std/math
+import std/assertions
 
 const manualTest = false
 

tests/stdlib/tgenast.nim

@@ -7,6 +7,7 @@ discard """
 import std/genasts
 import std/macros
 from std/strformat import `&`
+import std/assertions
 import ./mgenast
 
 proc main =

tests/stdlib/tgetaddrinfo.nim

@@ -6,6 +6,7 @@ discard """
 # bug: https://github.com/nim-lang/Nim/issues/10198
 
 import nativesockets
+import std/assertions
 
 block DGRAM_UDP:
   let aiList = getAddrInfo("127.0.0.1", 999.Port, AF_INET, SOCK_DGRAM, IPPROTO_UDP)

tests/stdlib/tgetfileinfo.nim

@@ -4,6 +4,7 @@ discard """
 """
 
 import os, strutils
+import std/syncio
 # Cases
 #  1 - String : Existing File : Symlink true
 #  2 - String : Existing File : Symlink false

tests/stdlib/tgetprotobyname.nim

@@ -1,4 +1,5 @@
 import nativesockets
+import std/assertions
 
 doAssert getProtoByName("ipv6") == 41
 doAssert getProtoByName("tcp") == 6

tests/stdlib/tglobs.nim

@@ -1,4 +1,5 @@
 import std/private/globs
+import std/assertions
 
 template main =
   when defined(windows):

tests/stdlib/thashes.nim

@@ -4,6 +4,7 @@ discard """
 
 import std/hashes
 from stdtest/testutils import disableVm, whenVMorJs
+import std/assertions
 
 when not defined(js) and not defined(cpp):
   block:

tests/stdlib/theapqueue.nim

@@ -1,5 +1,5 @@
 import std/heapqueue
-
+import std/assertions
 
 proc toSortedSeq[T](h: HeapQueue[T]): seq[T] =
   var tmp = h

tests/stdlib/thtmlparser.nim

@@ -11,7 +11,7 @@ import htmlparser
 import xmltree
 import strutils
 from streams import newStringStream
-
+import std/assertions
 
 block t2813:
   const

tests/stdlib/thttpclient.nim

@@ -14,6 +14,8 @@ from net import TimeoutError
 
 import nativesockets, os, httpclient, asyncdispatch
 
+import std/[assertions, syncio]
+
 const manualTests = false
 
 proc makeIPv6HttpServer(hostname: string, port: Port,

tests/stdlib/thttpclient_ssl.nim

@@ -15,7 +15,7 @@ discard """
 
 when not defined(windows):
   # Disabled on Windows due to old OpenSSL version
-
+  import std/[formatfloat, syncio]
   import
     httpclient,
     net,

tests/stdlib/thttpclient_standalone.nim

@@ -4,6 +4,8 @@ discard """
 
 import asynchttpserver, httpclient, asyncdispatch, strutils, net
 
+import std/assertions
+
 block: # bug #16436
   proc startServer(): AsyncHttpServer =
     result = newAsyncHttpServer()

tests/stdlib/thttpcore.nim

@@ -1,4 +1,5 @@
 import httpcore, strutils
+import std/assertions
 
 block:
   block HttpCode:

tests/stdlib/tio.nim

@@ -2,6 +2,7 @@
 
 import std/os
 from stdtest/specialpaths import buildDir
+import std/[assertions, syncio]
 
 block: # readChars
   let file = buildDir / "D20201118T205105.txt"

tests/stdlib/tisolation.nim

@@ -4,7 +4,7 @@ discard """
 """
 
 import std/[isolation, json]
-
+import std/[assertions, objectdollar]
 
 
 proc main(moveZeroesOut: static bool) =

tests/stdlib/tjsbigints.nim

@@ -2,7 +2,7 @@ discard """
   targets: "js"
 """
 
-import std/jsbigints
+import std/[jsbigints, assertions]
 
 
 let big1: JsBigInt = big"2147483647"

tests/stdlib/tjson.nim

@@ -14,6 +14,7 @@ when not defined(js):
   import std/streams
 import stdtest/testutils
 from std/fenv import epsilon
+import std/[assertions, objectdollar]
 
 proc testRoundtrip[T](t: T, expected: string) =
   # checks that `T => json => T2 => json2` is such that json2 = json

tests/stdlib/tjsonmacro.nim

@@ -4,6 +4,7 @@ discard """
 """
 
 import json, strutils, options, tables
+import std/assertions
 
 # The definition of the `%` proc needs to be here, since the `% c` calls below
 # can only find our custom `%` proc for `Pix` if defined in global scope.

tests/stdlib/tjsonutils.nim

@@ -7,6 +7,7 @@ import std/json
 from std/math import isNaN, signbit
 from std/fenv import epsilon
 from stdtest/testutils import whenRuntimeJs
+import std/[assertions, objectdollar]
 
 proc testRoundtrip[T](t: T, expected: string) =
   # checks that `T => json => T2 => json2` is such that json2 = json

tests/stdlib/tlists.nim

@@ -3,6 +3,7 @@ discard """
 """
 
 import std/[lists, sequtils]
+import std/assertions
 
 const
   data = [1, 2, 3, 4, 5, 6]

tests/stdlib/tlocks.nim

@@ -5,6 +5,7 @@ discard """
 
 #bug #6049
 import uselocks
+import std/assertions
 
 var m = createMyType[int]()
 doAssert m.use() == 3

tests/stdlib/tmacros.nim

@@ -5,6 +5,7 @@ See also:
 ]#
 
 import std/macros
+import std/assertions
 
 block: # hasArgOfName
   macro m(u: untyped): untyped =

tests/stdlib/tmarshal.nim

@@ -3,6 +3,7 @@ discard """
 """
 
 import std/marshal
+import std/[assertions, objectdollar]
 
 # TODO: add static tests
 

tests/stdlib/tmath.nim

@@ -7,6 +7,8 @@ discard """
 # but it requires disabling certain lines with `when not defined(nimTmathCase2)`
 
 import std/math
+import std/assertions
+
 
 # Function for approximate comparison of floats
 proc `==~`(x, y: float): bool = abs(x - y) < 1e-9

tests/stdlib/tmd5.nim

@@ -3,6 +3,7 @@ discard """
 """
 
 import md5
+import std/assertions
 
 proc main() {.raises: [].} =
   doAssert(getMD5("Franz jagt im komplett verwahrlosten Taxi quer durch Bayern") ==