remove conditionals on nimHasUserErrors, nimNoNilSeqs2, nimNoNilSeqs (#16861)

* cleanup docs for type(nil) | type(nil); simplify nimHasUserErrors

* simplify nimNoNilSeqs2

* simplify nimNoNilSeqs

* fixup
This commit is contained in:
Timothee Cour
2021-01-29 05:30:24 -08:00
committed by GitHub
parent 4e1e231e29
commit 6e267d28b3
13 changed files with 29 additions and 93 deletions

View File

@@ -180,7 +180,7 @@ proc initPackedSet*[A]: PackedSet[A] =
counter: 0,
max: 0,
head: nil,
data: when defined(nimNoNilSeqs): @[] else: nil)
data: @[])
# a: array[0..33, int] # profiling shows that 34 elements are enough
proc contains*[A](s: PackedSet[A], key: A): bool =
@@ -392,10 +392,7 @@ proc clear*[A](result: var PackedSet[A]) =
# setLen(result.data, InitIntSetSize)
# for i in 0..InitIntSetSize - 1: result.data[i] = nil
# result.max = InitIntSetSize - 1
when defined(nimNoNilSeqs):
result.data = @[]
else:
result.data = nil
result.data = @[]
result.max = 0
result.counter = 0
result.head = nil
@@ -426,10 +423,7 @@ proc assign*[A](dest: var PackedSet[A], src: PackedSet[A]) =
assert len(a) == 2
if src.elems <= src.a.len:
when defined(nimNoNilSeqs):
dest.data = @[]
else:
dest.data = nil
dest.data = @[]
dest.max = 0
dest.counter = src.counter
dest.head = nil