Skip to content

Commit 915f89b

Browse files
committed
Merge remote-tracking branch 'origin/master' into generic-lookup-workaround
2 parents 23429eb + dfeef8b commit 915f89b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

tests/test_results.nim

+14-14
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,18 @@ block:
6767

6868
# Exception on access
6969
doAssert (
70-
try:
71-
(discard rOk.tryError(); false)
72-
except ResultError[int]:
73-
true
70+
block:
71+
try:
72+
(discard rOk.tryError(); false)
73+
except ResultError[int]:
74+
true
7475
)
7576
doAssert (
76-
try:
77-
(discard rErr.tryGet(); false)
78-
except ResultError[string]:
79-
true
77+
block:
78+
try:
79+
(discard rErr.tryGet(); false)
80+
except ResultError[string]:
81+
true
8082
)
8183

8284
# Value access or default
@@ -596,13 +598,11 @@ block: # `cstring` dangling reference protection
596598
block: # Experiments
597599
# Can formalise it into a template (https://github.com/arnetheduck/nim-result/issues/8)
598600
template `?=`(v: untyped{nkIdent}, vv: Result): bool =
599-
(
600-
let vr = vv
601-
template v(): auto {.used.} =
602-
unsafeGet(vr)
601+
let vr = vv
602+
template v(): auto {.used.} =
603+
unsafeGet(vr)
603604

604-
vr.isOk
605-
)
605+
vr.isOk
606606

607607
if f ?= Result[int, string].ok(42):
608608
doAssert f == 42

0 commit comments

Comments
 (0)