diff options
author | Clyybber <darkmine956@gmail.com> | 2020-07-08 20:48:17 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2020-07-10 13:36:02 +0200 |
commit | 4a1128d16c68437463c385645e65ef3d61fa30da (patch) | |
tree | db8696c3bed9ad41f3305875dd1e7d0f6d13bc11 /lib | |
parent | 3e52136f262b9700713eb10594f18e42a2f2af65 (diff) | |
download | Nim-4a1128d16c68437463c385645e65ef3d61fa30da.tar.gz |
Move `wasMoved` out of `=destroy`
Diffstat (limited to 'lib')
-rw-r--r-- | lib/system/seqs_v2.nim | 3 | ||||
-rw-r--r-- | lib/system/widestrs.nim | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/system/seqs_v2.nim b/lib/system/seqs_v2.nim index 1b40c00ab..4001e97c3 100644 --- a/lib/system/seqs_v2.nim +++ b/lib/system/seqs_v2.nim @@ -73,11 +73,10 @@ proc shrink*[T](x: var seq[T]; newLen: Natural) = when nimvm: setLen(x, newLen) else: - mixin `=destroy` #sysAssert newLen <= x.len, "invalid newLen parameter for 'shrink'" when not supportsCopyMem(T): for i in countdown(x.len - 1, newLen): - `=destroy`(x[i]) + reset x[i] # XXX This is wrong for const seqs that were moved into 'x'! cast[ptr NimSeqV2[T]](addr x).len = newLen diff --git a/lib/system/widestrs.nim b/lib/system/widestrs.nim index aabcbdc90..83c11eb79 100644 --- a/lib/system/widestrs.nim +++ b/lib/system/widestrs.nim @@ -28,7 +28,6 @@ when defined(nimv2): proc `=destroy`(a: var WideCStringObj) = if a.data != nil: deallocShared(a.data) - a.data = nil proc `=`(a: var WideCStringObj; b: WideCStringObj) {.error.} |