fixup

Author: timotheecour

lib/pure/hashes.nim

@@ -98,7 +98,6 @@ proc hashUInt64*(x: uint64): Hash {.inline.} =
     doAssert false
   else:
     # would orders of magnitude worse, see thashes_perf toHighOrderBits
-    # faster than using murmurhash or Jenkins via
     # hashData(cast[pointer](unsafeAddr x), type(x).sizeof)
 
     # would a bit worse, see thashes_perf toInt64
@@ -118,14 +117,12 @@ proc hashUInt64*(x: uint64): Hash {.inline.} =
 
 proc hashUInt32*(x: uint32): Hash {.inline.} =
   ## for internal use; user code should prefer `hash` overloads
-  # calling `hashUInt64(x)` would perform 1.736 worse, see thashes_perf toInt32
+  # calling `hashUInt64(x)` would perform 1.7X slower, see thashes_perf toInt32
   when nimvm: # in vmops
     doAssert false
   else:
     # inspired from https://gist.github.com/badboy/6267743
     var x = x xor ((x shr 20) xor (x shr 12))
-    # debugEcho ("hashUInt32", x)
-    # return cast[Hash](x xor (x shr 7) xor (x shr 4))
     result = cast[Hash](x xor (x shr 7) xor (x shr 4))
 
 proc hash*[T: SomeNumber | Ordinal | char](x: T): Hash {.inline.} =

tests/collections/ttables.nim

@@ -164,11 +164,10 @@ block tableconstr:
 
 block ttables2:
   proc TestHashIntInt() =
-    var tab = initTable[int, int]()
-    const n = 1_000_000 # bottleneck: 50 seconds on OSX in debug mode
-    for i in 1..n:
+    var tab = initTable[int,int]()
+    for i in 1..1_000_000:
       tab[i] = i
-    for i in 1..n:
+    for i in 1..1_000_000:
       var x = tab[i]
       if x != i : echo "not found ", i
 
@@ -185,6 +184,7 @@ block ttables2:
     delTab.del(i)
   delTab[5] = 5
 
+
   run1()
   echo "2"
 
@@ -340,7 +340,8 @@ block tablesref:
   block anonZipTest:
     let keys = @['a','b','c']
     let values = @[1, 2, 3]
-    doAssert "{'a': 1, 'b': 2, 'c': 3}" == $ toTable zip(keys, values)
+    var t = toTable(zip(keys, values))
+    doAssert toSeq(t.pairs).sorted == @[('a', 1), ('b', 2), ('c', 3)]
 
   block clearTableTest:
     var t = newTable[string, float]()