Removed Async.retn since it duplicates Async.singleton

demystifyfp · Dec 17, 2024 · e0cfdd1 · e0cfdd1
1 parent edc9ae0
commit e0cfdd1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 34 deletions.
diff --git a/src/FsToolkit.ErrorHandling/Async.fs b/src/FsToolkit.ErrorHandling/Async.fs
@@ -15,15 +15,6 @@ module Async =
         value
         |> async.Return
 
-    /// <summary>
-    /// Converts a value to an <c>Async</c> value
-    /// </summary>
-    /// <param name="value">The value to convert to an <c>Async</c> value.</param>
-    /// <returns>The <c>Async</c> value.</returns>
-    let inline retn (value: 'value) : Async<'value> =
-        value
-        |> async.Return
-
     /// <summary>
     /// Takes a transformation function and applies it to the value of an <c>Async</c> value.
     /// </summary>

diff --git a/src/FsToolkit.ErrorHandling/AsyncValidationCE.fs b/src/FsToolkit.ErrorHandling/AsyncValidationCE.fs
@@ -167,7 +167,7 @@ module AsyncValidationCE =
             /// Method lets us transform data types into our internal representation.
             /// </summary>
             member inline _.Source(s: Validation<'ok, 'error>) : AsyncValidation<'ok, 'error> =
-                Async.retn s
+                Async.singleton s
 
 #if !FABLE_COMPILER
 

diff --git a/tests/FsToolkit.ErrorHandling.Tests/AsyncOptionCE.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncOptionCE.fs
@@ -255,7 +255,7 @@ let ``AsyncOptionCE using Tests`` =
         <| async {
             let mutable disposed = false
             let mutable finished = false
-            let f1 _ = Async.retn (Some 42)
+            let f1 _ = Async.singleton (Some 42)
 
             let! actual =
                 asyncOption {

diff --git a/tests/FsToolkit.ErrorHandling.Tests/AsyncValidation.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncValidation.fs
@@ -149,7 +149,7 @@ let applyTests =
                 |> lift
                 |> AsyncValidation.apply (
                     Ok remainingCharacters
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -162,7 +162,7 @@ let applyTests =
             let! result =
                 AsyncValidation.apply
                     (Ok remainingCharacters
-                     |> Async.retn)
+                     |> Async.singleton)
                     (lift emptyInvalidTweetR)
 
             return
@@ -184,7 +184,7 @@ let operatorsTests =
                 <*> (lift validTweetR)
                 >>= (fun tweet ->
                     Ok tweet
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -212,9 +212,9 @@ let zipTests =
             let! actual =
                 AsyncValidation.zip
                     (Ok 1
-                     |> Async.retn)
+                     |> Async.singleton)
                     (Ok 2
-                     |> Async.retn)
+                     |> Async.singleton)
 
             Expect.equal actual (Ok(1, 2)) "Should be ok"
         }
@@ -223,7 +223,7 @@ let zipTests =
             let! actual =
                 AsyncValidation.zip
                     (Ok 1
-                     |> Async.retn)
+                     |> Async.singleton)
                     (AsyncValidation.error "Bad")
 
             Expect.equal actual (Error [ "Bad" ]) "Should be Error"
@@ -234,7 +234,7 @@ let zipTests =
                 AsyncValidation.zip
                     (AsyncValidation.error "Bad")
                     (Ok 1
-                     |> Async.retn)
+                     |> Async.singleton)
 
             Expect.equal actual (Error [ "Bad" ]) "Should be Error"
         }
@@ -260,10 +260,10 @@ let orElseTests =
         <| async {
             let! result =
                 (Ok "First"
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElse (
                     Ok "Second"
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -274,10 +274,10 @@ let orElseTests =
         <| async {
             let! result =
                 (Ok "First"
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElse (
                     Error [ "Second" ]
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -288,10 +288,10 @@ let orElseTests =
         <| async {
             let! result =
                 (Error [ "First" ]
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElse (
                     Ok "Second"
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -302,10 +302,10 @@ let orElseTests =
         <| async {
             let! result =
                 (Error [ "First" ]
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElse (
                     Error [ "Second" ]
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -320,10 +320,10 @@ let orElseWithTests =
         <| async {
             let! result =
                 (Ok "First"
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElseWith (fun _ ->
                     Ok "Second"
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -334,10 +334,10 @@ let orElseWithTests =
         <| async {
             let! result =
                 (Ok "First"
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElseWith (fun _ ->
                     Error [ "Second" ]
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -348,10 +348,10 @@ let orElseWithTests =
         <| async {
             let! result =
                 (Error [ "First" ]
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElseWith (fun _ ->
                     Ok "Second"
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return
@@ -362,10 +362,10 @@ let orElseWithTests =
         <| async {
             let! result =
                 (Error [ "First" ]
-                 |> Async.retn)
+                 |> Async.singleton)
                 |> AsyncValidation.orElseWith (fun _ ->
                     Error [ "Second" ]
-                    |> Async.retn
+                    |> Async.singleton
                 )
 
             return