mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-03 19:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

make std/options compatible with strictdefs (#23675)

Browse Source
This commit is contained in:
ringabout
2024-06-06 02:54:25 +08:00
committed by GitHub
parent 2d1533f34f
commit 87e56cabbb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pure/options.nim
View File

@@ -117,9 +117,10 @@ proc option*[T](val: sink T): Option[T] {.inline.} =
assert option[Foo](nil).isNone
assert option(42).isSome
result.val = val
when T isnot SomePointer:
result.has = true
when T is SomePointer:
result = Option[T](val: val)
else:
result = Option[T](has: true, val: val)
proc some*[T](val: sink T): Option[T] {.inline.} =
## Returns an `Option` that has the value `val`.
@@ -136,10 +137,9 @@ proc some*[T](val: sink T): Option[T] {.inline.} =
when T is SomePointer:
assert not val.isNil
result.val = val
result = Option[T](val: val)
else:
result.has = true
result.val = val
result = Option[T](has: true, val: val)
proc none*(T: typedesc): Option[T] {.inline.} =
## Returns an `Option` for this type that has no value.