ordset, prefix with std, intset cleanup

nim-lang · Oct 14, 2020 · 63687ac · 63687ac
1 parent 336c77e
commit 63687ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/pure/collections/intsets.nim b/lib/pure/collections/intsets.nim
@@ -12,9 +12,12 @@
 ## * `ordinal sets module <ordsets.html>`_ for more general int sets
 
 import std/private/since
-import ordsets
+import std/ordsets
 export ordsets
 
+type
+  IntSet* = OrdSet[int]
+
 proc toIntSet*(x: openArray[int]): IntSet {.since: (1, 3), inline.} = toOrdSet[int](x)
 
 proc initIntSet*(): IntSet {.inline.} = initOrdSet[int]()

diff --git a/lib/pure/collections/ordsets.nim b/lib/pure/collections/ordsets.nim
@@ -53,7 +53,6 @@ type
     data: TrunkSeq
     a: array[0..33, int] # profiling shows that 34 elements are enough
 
-  IntSet* = OrdSet[int]
 
 proc mustRehash[T](t: T): bool {.inline.} =
   let length = t.max + 1

diff --git a/tests/stdlib/tordsets.nim b/tests/stdlib/tordsets.nim
@@ -1,4 +1,4 @@
-import ordsets
+import std/ordsets
 import std/sets
 
 from sequtils import toSeq
@@ -65,7 +65,7 @@ block: # we use HashSet as groundtruth, it's well tested elsewhere
           # issue #13505
           doAssert t.missingOrExcl(`A`(i))
 
-  var t: IntSet
+  var t: OrdSet[int]
   var t0: HashSet[int]
   testDel(int, t, t0)