diff options
author | metagn <metagngn@gmail.com> | 2022-08-21 03:07:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-20 20:07:33 -0400 |
commit | 1b61e71bb81ba53cf3cfbcbb581fa61cf7fac612 (patch) | |
tree | 7a0648a5bb10368dc3defd74ad2438b2798b7247 | |
parent | f4bbf3bf0b5188352ee996831f921150760fb112 (diff) | |
download | Nim-1b61e71bb81ba53cf3cfbcbb581fa61cf7fac612.tar.gz |
Remove string == nil/nil == string error (#20222)
* Remove string == nil/nil == string error This was to help migration for `nil` strings being removed, but `nil` strings have been gone for a while now. * remove isNil too
-rw-r--r-- | lib/system.nim | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/lib/system.nim b/lib/system.nim index 738666e8d..5307bec4f 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -1604,18 +1604,6 @@ proc len*[U: Ordinal; V: Ordinal](x: HSlice[U, V]): int {.noSideEffect, inline.} ## assert((5..2).len == 0) result = max(0, ord(x.b) - ord(x.a) + 1) -when true: # PRTEMP: remove? - proc isNil*[T](x: seq[T]): bool {.noSideEffect, magic: "IsNil", error.} - ## Seqs are no longer nil by default, but set and empty. - ## Check for zero length instead. - ## - ## See also: - ## * `isNil(string) <#isNil,string>`_ - - proc isNil*(x: string): bool {.noSideEffect, magic: "IsNil", error.} - ## See also: - ## * `isNil(seq[T]) <#isNil,seq[T]>`_ - proc isNil*[T](x: ref T): bool {.noSideEffect, magic: "IsNil".} proc isNil*[T](x: ptr T): bool {.noSideEffect, magic: "IsNil".} @@ -3019,17 +3007,6 @@ proc `==`*(x, y: cstring): bool {.magic: "EqCString", noSideEffect, elif x.isNil or y.isNil: result = false else: result = strcmp(x, y) == 0 -when true: # xxx PRTEMP remove - # bug #9149; ensure that 'typeof(nil)' does not match *too* well by using 'typeof(nil) | typeof(nil)', - # especially for converters, see tests/overload/tconverter_to_string.nim - # Eventually we will be able to remove this hack completely. - proc `==`*(x: string; y: typeof(nil) | typeof(nil)): bool {. - error: "'nil' is now invalid for 'string'".} = - discard - proc `==`*(x: typeof(nil) | typeof(nil); y: string): bool {. - error: "'nil' is now invalid for 'string'".} = - discard - template closureScope*(body: untyped): untyped = ## Useful when creating a closure in a loop to capture local loop variables by ## their current iteration values. |