ordsets bump since to 1.5

lib/pure/collections/intsets.nim

@@ -7,18 +7,10 @@
 #    distribution, for details about the copyright.
 #
 
-## Deprecated by the generic `OrdSet` for ordinal sparse sets.
+## Deprecated by the generic `OrdSet` for ordinal sparse set
 ## **See also:**
 ## * `ordinal sets module <ordsets.html>`_ for more general int sets
 
 import std/private/since
 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]()
-

lib/std/ordsets.nim

@@ -160,7 +160,7 @@ iterator items*[A](s: OrdSet[A]): A {.inline.} =
         inc(i)
       r = r.next
 
-proc initOrdSet*[A]: OrdSet[A] =
+proc initOrdSet*[A]: OrdSet[A] {.since: (1, 5).} =
   ## Returns an empty OrdSet[A].
   ## A must be an ordinal equivalent type: int | enum | distinct int
   ##
@@ -268,7 +268,7 @@ proc incl*[A](s: var OrdSet[A], other: OrdSet[A]) =
 
   for item in other: incl(s, item)
 
-proc toOrdSet*[A](x: openArray[A]): OrdSet[A] {.since: (1, 3).} =
+proc toOrdSet*[A](x: openArray[A]): OrdSet[A] {.since: (1, 5).} =
   ## Creates a new OrdSet[A] that contains the elements of `x`.
   ##
   ## Duplicates are removed.
@@ -607,6 +607,18 @@ proc `$`*[A](s: OrdSet[A]): string =
   ## Converts the set `s` to a string, mostly for logging and printing purposes.
   dollarImpl()
 
+# For backward compatibility with intsets ( before version 1.5 )
+# we provide concrete methods for intset
+type IntSet* = OrdSet[int]
+proc toIntSet*(x: openArray[int]): IntSet {.since: (1, 3), inline.} = toOrdSet[int](x)
+proc initIntSet*(): IntSet =
+  # This is initOrdSet[int]() but would require since 1.5 to pass tests
+  result = IntSet(
+    elems: 0,
+    counter: 0,
+    max: 0,
+    head: nil,
+    data: when defined(nimNoNilSeqs): @[] else: nil)
 
 
 when isMainModule: