fixup

Author: timotheecour

testament/important_packages.nim

@@ -5,7 +5,10 @@ template pkg(name: string; cmd = "nimble test"; hasDeps = false; url = ""): unty
 var packages*: seq[tuple[name, cmd: string; hasDeps: bool; url: string]] = @[]
 
 proc toCommand(cmd: string): string =
-  # refs https://github.com/nim-lang/Nim/pull/13408
+  ## useful for running shell commands, eg in case a package is broken and needs
+  ## a hotfix you can write:
+  ## pkg "foo", "git checkout hotfix && nimble test".toCommand, url = "https://github.com/username/foo"
+  ## see also: https://github.com/nim-lang/Nim/pull/13408
   when defined(windows): "cmd /c " & cmd else: cmd
 
 pkg "argparse"
@@ -39,7 +42,7 @@ pkg "gnuplot"
 pkg "hts", "nim c -o:htss src/hts.nim"
 pkg "illwill", "nimble examples"
 pkg "inim"
-pkg "itertools", "git checkout pr_fix_for_new_hashes && nim doc src/itertools.nim".toCommand, url = "https://github.com/timotheecour/itertools"
+pkg "itertools", "nim doc src/itertools.nim"
 pkg "iterutils"
 pkg "jstin"
 pkg "karax", "nim c -r tests/tester.nim"

tests/collections/ttables.nim

@@ -227,14 +227,14 @@ block tablesref:
   block tableTest1:
     var t = newTable[tuple[x, y: int], string]()
     t[(0,0)] = "00"
+    doAssert $t == """{(x: 0, y: 0): "00"}"""
     t[(1,0)] = "10"
     t[(0,1)] = "01"
     t[(1,1)] = "11"
     for x in 0..1:
       for y in 0..1:
         assert t[(x,y)] == $x & $y
-    assert($t ==
-      """{(x: 0, y: 1): "01", (x: 1, y: 0): "10", (x: 0, y: 0): "00", (x: 1, y: 1): "11"}""")
+    doAssert toSeq(t.pairs).sorted == @[((x: 0, y: 0), "00"), ((x: 0, y: 1), "01"), ((x: 1, y: 0), "10"), ((x: 1, y: 1), "11")]
 
   block tableTest2:
     var t = newTable[string, float]()

tests/collections/ttablesthreads.nim

@@ -3,7 +3,7 @@ discard """
   output: '''true'''
 """
 
-import hashes, tables, sharedtables
+import hashes, tables, sharedtables, sequtils, algorithm
 
 const
   data = {
@@ -47,8 +47,8 @@ block tableTest1:
   for x in 0..1:
     for y in 0..1:
       assert t[(x,y)] == $x & $y
-  assert($t ==
-    """{(x: 0, y: 1): "01", (x: 1, y: 0): "10", (x: 0, y: 0): "00", (x: 1, y: 1): "11"}""")
+  doAssert toSeq(t.pairs).sorted ==
+    @[((x: 0, y: 0), "00"), ((x: 0, y: 1), "01"), ((x: 1, y: 0), "10"), ((x: 1, y: 1), "11")]
 
 block tableTest2:
   var t = initTable[string, float]()

tests/vm/tcompiletimetable.nim

@@ -64,7 +64,7 @@ block:
       proc fun(): string =
         var t: Table[T, string]
         let n = 10
-        for i in 0..<n:
+        for i in 0.int64..<n.int64:
           let i2 = when T.sizeof == type(i).sizeof: i else: i.int32
           let k = cast[T](i2)
             # cast intentional for regression testing,