logos-storage/questionable
1
0
Fork 0
mirror of https://github.com/logos-storage/questionable.git synced 2026-01-05 23:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix BareExcept warnings

Browse Source
This commit is contained in:
Mark Spanbroek 2023-12-19 15:23:12 +01:00 committed by markspanbroek
parent 4a74d65e17
commit 43e7deb827
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
questionable/private/bareexcept.nim Normal file
View File

@ -0,0 +1,6 @@
template ignoreBareExceptWarning*(body) =
when defined(nimHasWarnBareExcept):
{.push warning[BareExcept]:off warning[UnreachableCode]:off.}
body
when defined(nimHasWarnBareExcept):
{.pop.}

12
questionable/results.nim
View File

@ -7,6 +7,7 @@ import ./indexing
import ./operators import ./operators
import ./without import ./without
import ./withoutresult import ./withoutresult
import ./private/bareexcept
include ./private/errorban include ./private/errorban
@ -109,12 +110,13 @@ proc option*[T,E](value: Result[T,E]): ?T =
## Converts a Result into an Option. ## Converts a Result into an Option.
if value.isOk: if value.isOk:
try: # workaround for erroneous exception tracking when T is a closure ignoreBareExceptWarning:
value.unsafeGet.some try: # workaround for erroneous exception tracking when T is a closure
except Exception as exception: return value.unsafeGet.some
raise newException(Defect, exception.msg, exception) except Exception as exception:
raise newException(Defect, exception.msg, exception)
else: else:
T.none return T.none
template toOption*[T, E](value: Result[T, E]): ?T = template toOption*[T, E](value: Result[T, E]): ?T =
## Converts a Result into an Option. ## Converts a Result into an Option.