Fix return types of and_then methods.

MylesBartlett · Jul 22, 2024 · 36a9255 · 36a9255
1 parent 11ddff0
commit 36a9255
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/serox/option.py b/serox/option.py
@@ -187,8 +187,8 @@ def map_or_else[U](self: Option[T], default: Fn0[U], f: Fn1[T, U], /) -> U:
     @overload
     def and_then[U](self: Null[T], f: Fn1[T, U], /) -> Null[U]: ...
     @overload
-    def and_then[U](self: Some[T], f: Fn1[T, U], /) -> U: ...
-    def and_then[U](self: Option[T], f: Fn1[T, U], /) -> U | Null[U]:
+    def and_then[U](self: Some[T], f: Fn1[T, U], /) -> Option[U]: ...
+    def and_then[U](self: Option[T], f: Callable[[T], Option[U]], /) -> Option[U]:
         match self:
             case Some(x):
                 return f(x)

diff --git a/serox/result.py b/serox/result.py
@@ -182,8 +182,8 @@ def err(self: Result[T, E]) -> Option[E]:
     @overload
     def and_then[U](self: Err[T, E], f: Fn1[T, U], /) -> Err[U, E]: ...
     @overload
-    def and_then[U](self: Ok[T, E], f: Fn1[T, U], /) -> U: ...
-    def and_then[U](self: Result[T, E], op: Fn1[T, U], /) -> U | Err[U, E]:
+    def and_then[U](self: Ok[T, E], f: Fn1[T, U], /) -> Result[U, E]: ...
+    def and_then[U](self: Result[T, E], op: Callable[[T], Result[U, E]], /) -> Result[U, E]:
         match self:
             case Ok(t):
                 return op(t)