x

arnetheduck · Mar 11, 2024 · b3c483f · b3c483f
1 parent ecf9d1e
commit b3c483f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - test-*
   pull_request:
   workflow_dispatch:
     inputs:

diff --git a/results.nim b/results.nim
@@ -300,43 +300,20 @@ type
     ## https://github.com/nim-lang/Nim/issues/13799 - type issues
     ## https://github.com/nim-lang/Nim/issues/8745 - genericReset slow
     ## https://github.com/nim-lang/Nim/issues/13879 - double-zero-init slow
-    ## https://github.com/nim-lang/Nim/issues/14318 - generic error raises pragma
+    ## https://github.com/nim-lang/Nim/issues/14318 - generic error raises pragma (fixed in 1.6.14+)
 
-    # TODO https://github.com/nim-lang/Nim/issues/20699
-    # case oResultPrivate: bool
-    # of false:
-    #   eResultPrivate: E
-    # of true:
-    #   vResultPrivate: T
 
     # TODO ResultPrivate works around
     # * https://github.com/nim-lang/Nim/issues/3770
     # * https://github.com/nim-lang/Nim/issues/20900
     #
     # Do not use these fields directly in your code, they're not meant to be
     # public!
-    when T is void:
-      when E is void:
-        oResultPrivate*: bool
-      else:
-        case oResultPrivate*: bool
-        of false:
-          eResultPrivate*: E
-        of true:
-          discard
-    else:
-      when E is void:
-        case oResultPrivate*: bool
-        of false:
-          discard
-        of true:
-          vResultPrivate*: T
-      else:
-        case oResultPrivate*: bool
-        of false:
-          eResultPrivate*: E
-        of true:
-          vResultPrivate*: T
+    case oResultPrivate*: bool
+    of false:
+      eResultPrivate*: E
+    of true:
+      vResultPrivate*: T
 
   Opt*[T] = Result[T, void]