jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid re-exporting options from std/wrapnils (#18222)

Browse source
This commit is contained in:
Timothee Cour 2021-06-09 22:00:34 -07:00 • committed by GitHub
commit 79ded694d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/std/wrapnils.nim
View file

@ -25,7 +25,6 @@ runnableExamples:
assert (?.f2.x2.x2).x3 == nil # this terminates ?. early assert (?.f2.x2.x2).x3 == nil # this terminates ?. early
from options import Option, isSome, get, option, unsafeGet, UnpackDefect from options import Option, isSome, get, option, unsafeGet, UnpackDefect
export options.get, options.isSome, options.isNone
template fakeDot*(a: Option, b): untyped = template fakeDot*(a: Option, b): untyped =
## See top-level example. ## See top-level example.
@ -90,6 +89,7 @@ macro `?.`*(a: untyped): auto =
macro `??.`*(a: untyped): Option = macro `??.`*(a: untyped): Option =
## Same as `?.` but returns an `Option`. ## Same as `?.` but returns an `Option`.
runnableExamples: runnableExamples:
import std/options
type Foo = ref object type Foo = ref object
x1: ref int x1: ref int
x2: int x2: int

1
tests/stdlib/twrapnils.nim
View file

@ -1,4 +1,5 @@
import std/wrapnils import std/wrapnils
from std/options import get, isSome
proc checkNotZero(x: float): float = proc checkNotZero(x: float): float =
doAssert x != 0 doAssert x != 0