status-im
/
nim-stew
mirror of https://github.com/status-im/nim-stew.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

results: make `?` work with void (#50)

This commit is contained in:
Jacek Sieka 2020-07-13 18:09:45 +02:00 committed by GitHub
parent 61e0f82858
commit ec2f52b0ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stew/results.nim
View File

@ -621,7 +621,7 @@ template value*[E](self: var Result[void, E]) =
mixin get mixin get
self.get() self.get()
template `?`*[T, E](self: Result[T, E]): T = template `?`*[T, E](self: Result[T, E]): auto =
## Early return - if self is an error, we will return from the current ## Early return - if self is an error, we will return from the current
## function, else we'll move on.. ## function, else we'll move on..
## ##
@ -639,4 +639,5 @@ template `?`*[T, E](self: Result[T, E]): T =
else: else:
return err(typeof(result), v.e) return err(typeof(result), v.e)
v.v when not(T is void):
v.v

10
tests/test_results.nim
View File

@ -256,3 +256,13 @@ except:
discard discard
doAssert vErr.mapErr(proc(x: int): int = 10).error() == 10 doAssert vErr.mapErr(proc(x: int): int = 10).error() == 10
func voidF(): VoidRes =
ok()
func voidF2(): VoidRes =
? voidF()
ok()
doAssert voidF2().isOk