Some fixes for Result[T, void]

2020-09-29 21:31:20 +03:00 · 2020-09-29 21:31:20 +03:00 · 2b9e5f34d1
parent 3e4dc8213b
commit 2b9e5f34d1
1 changed files with 8 additions and 2 deletions
--- a/stew/results.nim
+++ b/stew/results.nim
@ -498,12 +498,18 @@ func expect*[T: not void, E](self: Result[T, E], m: string): T =
  ## echo r.expect("r was just set to ok(42)")
  ## ```
  if not self.o:
+    when E isnot void:
      raiseResultDefect(m, self.e)
+    else:
+      raiseResultDefect(m)
  self.v

 func expect*[T: not void, E](self: var Result[T, E], m: string): var T =
  if not self.o:
+    when E isnot void:
      raiseResultDefect(m, self.e)
+    else:
+      raiseResultDefect(m)
  self.v

 func `$`*(self: Result): string =