Reverted some instances of singleton back to ok/some

Author: 1eyewonder

src/FsToolkit.ErrorHandling/Array.fs

@@ -53,7 +53,7 @@ module Array =
     let sequenceResultM xs = traverseResultM id xs
 
     let traverseAsyncResultM f xs =
-        traverseAsyncResultM' (AsyncResult.singleton [||]) f xs
+        traverseAsyncResultM' (AsyncResult.ok [||]) f xs
 
     let sequenceAsyncResultM xs = traverseAsyncResultM id xs
 
@@ -88,8 +88,7 @@ module Array =
 
                 match s, fR with
                 | Ok ys, Ok y ->
-                    return!
-                        traverseAsyncResultA' (AsyncResult.singleton (Array.append [| y |] ys)) f xs
+                    return! traverseAsyncResultA' (AsyncResult.ok (Array.append [| y |] ys)) f xs
                 | Error errs, Error e ->
                     return!
                         traverseAsyncResultA'
@@ -128,7 +127,7 @@ module Array =
     let sequenceValidationA xs = traverseValidationA id xs
 
     let traverseAsyncResultA f xs =
-        traverseAsyncResultA' (AsyncResult.singleton [||]) f xs
+        traverseAsyncResultA' (AsyncResult.ok [||]) f xs
 
     let sequenceAsyncResultA xs = traverseAsyncResultA id xs
 
@@ -194,7 +193,7 @@ module Array =
     let sequenceOptionM xs = traverseOptionM id xs
 
     let traverseAsyncOptionM f xs =
-        traverseAsyncOptionM' (AsyncOption.singleton [||]) f xs
+        traverseAsyncOptionM' (AsyncOption.some [||]) f xs
 
     let sequenceAsyncOptionM xs = traverseAsyncOptionM id xs
 

src/FsToolkit.ErrorHandling/AsyncOption.fs

@@ -21,13 +21,13 @@ module AsyncOption =
             )
             input
 
-    let inline singleton (value: 'value) : Async<'value option> = Async.singleton (Some value)
+    let inline some (value: 'value) : Async<'value option> = Async.singleton (Some value)
 
     let inline apply
         (applier: Async<('input -> 'output) option>)
         (input: Async<'input option>)
         : Async<'output option> =
-        bind (fun f' -> bind (fun x' -> singleton (f' x')) input) applier
+        bind (fun f' -> bind (fun x' -> some (f' x')) input) applier
 
     /// <summary>
     /// Returns result of running <paramref name="onSome"/> if it is <c>Some</c>, otherwise returns result of running <paramref name="onNone"/>

src/FsToolkit.ErrorHandling/AsyncOptionCE.fs

@@ -7,7 +7,7 @@ open System
 module AsyncOptionCE =
     type AsyncOptionBuilder() =
 
-        member inline _.Return(value: 'value) : Async<'value option> = AsyncOption.singleton value
+        member inline _.Return(value: 'value) : Async<'value option> = AsyncOption.some value
 
         member inline _.ReturnFrom(value: Async<'value option>) : Async<'value option> = value
 

src/FsToolkit.ErrorHandling/AsyncResult.fs

@@ -5,7 +5,7 @@ open System.Threading.Tasks
 [<RequireQualifiedAccess>]
 module AsyncResult =
 
-    let inline singleton (value: 'ok) : Async<Result<'ok, 'error>> =
+    let inline ok (value: 'ok) : Async<Result<'ok, 'error>> =
         Ok value
         |> Async.singleton
 
@@ -96,9 +96,9 @@ module AsyncResult =
     /// <example>
     /// <code>
     ///     AsyncResult.error "First" |> AsyncResult.orElse (AsyncResult.error "Second") // evaluates to Error ("Second")
-    ///     AsyncResult.error "First" |> AsyncResult.orElse (AsyncResult.singleton "Second") // evaluates to Ok ("Second")
-    ///     AsyncResult.singleton "First" |> AsyncResult.orElse (AsyncResult.error "Second") // evaluates to Ok ("First")
-    ///     AsyncResult.singleton "First" |> AsyncResult.orElse (AsyncResult.singleton "Second") // evaluates to Ok ("First")
+    ///     AsyncResult.error "First" |> AsyncResult.orElse (AsyncResult.ok "Second") // evaluates to Ok ("Second")
+    ///     AsyncResult.ok "First" |> AsyncResult.orElse (AsyncResult.error "Second") // evaluates to Ok ("First")
+    ///     AsyncResult.ok "First" |> AsyncResult.orElse (AsyncResult.ok "Second") // evaluates to Ok ("First")
     /// </code>
     /// </example>
     /// <returns>
@@ -108,7 +108,7 @@ module AsyncResult =
         (ifError: Async<Result<'ok, 'errorOutput>>)
         (input: Async<Result<'ok, 'errorInput>>)
         : Async<Result<'ok, 'errorOutput>> =
-        Async.bind (Result.either singleton (fun _ -> ifError)) input
+        Async.bind (Result.either ok (fun _ -> ifError)) input
 
     /// <summary>
     /// Returns <paramref name="input"/> if it is <c>Ok</c>, otherwise executes <paramref name="ifErrorFunc"/> and returns the result.
@@ -121,9 +121,9 @@ module AsyncResult =
     /// <example>
     /// <code>
     ///     AsyncResult.error "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.error "Second") // evaluates to Error ("Second")
-    ///     AsyncResult.error "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.singleton "Second") // evaluates to Ok ("Second")
-    ///     AsyncResult.singleton "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.error "Second") // evaluates to Ok ("First")
-    ///     AsyncResult.singleton "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.singleton "Second") // evaluates to Ok ("First")
+    ///     AsyncResult.error "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.ok "Second") // evaluates to Ok ("Second")
+    ///     AsyncResult.ok "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.error "Second") // evaluates to Ok ("First")
+    ///     AsyncResult.ok "First" |> AsyncResult.orElseWith (fun _ -> AsyncResult.ok "Second") // evaluates to Ok ("First")
     /// </code>
     /// </example>
     /// <returns>
@@ -133,7 +133,7 @@ module AsyncResult =
         ([<InlineIfLambda>] ifErrorFunc: 'errorInput -> Async<Result<'ok, 'errorOutput>>)
         (input: Async<Result<'ok, 'errorInput>>)
         : Async<Result<'ok, 'errorOutput>> =
-        Async.bind (Result.either singleton ifErrorFunc) input
+        Async.bind (Result.either ok ifErrorFunc) input
 
     /// Replaces the wrapped value with unit
     let inline ignore<'ok, 'error>

src/FsToolkit.ErrorHandling/AsyncResultOption.fs

@@ -20,7 +20,7 @@ module AsyncResultOption =
             (fun opt ->
                 match opt with
                 | Some x -> binder x
-                | None -> AsyncResult.singleton None
+                | None -> AsyncResult.ok None
             )
             input
 
@@ -41,7 +41,7 @@ module AsyncResultOption =
         AsyncResult.map3 (Option.map3 mapper) input1 input2 input3
 
     let inline singleton (value: 'ok) : Async<Result<'ok option, 'error>> =
-        AsyncResult.singleton (Some value)
+        AsyncResult.ok (Some value)
 
     let apply
         (applier: Async<Result<('okInput -> 'okOutput) option, 'error>>)

src/FsToolkit.ErrorHandling/AsyncValidation.fs

@@ -6,7 +6,7 @@ type AsyncValidation<'ok, 'error> = Async<Result<'ok, 'error list>>
 [<RequireQualifiedAccess>]
 module AsyncValidation =
 
-    let inline singleton (value: 'ok) : AsyncValidation<'ok, 'error> =
+    let inline ok (value: 'ok) : AsyncValidation<'ok, 'error> =
         Ok value
         |> async.Return
 
@@ -20,7 +20,7 @@ module AsyncValidation =
 
     let inline ofChoice (choice: Choice<'ok, 'error>) : AsyncValidation<'ok, 'error> =
         match choice with
-        | Choice1Of2 x -> singleton x
+        | Choice1Of2 x -> ok x
         | Choice2Of2 e -> error e
 
     let inline apply
@@ -56,7 +56,7 @@ module AsyncValidation =
 
             return!
                 result
-                |> Result.either singleton (fun _ -> ifError)
+                |> Result.either ok (fun _ -> ifError)
         }
 
     let inline orElseWith
@@ -68,7 +68,7 @@ module AsyncValidation =
 
             return!
                 match result with
-                | Ok x -> singleton x
+                | Ok x -> ok x
                 | Error err -> ifErrorFunc err
         }
 

src/FsToolkit.ErrorHandling/AsyncValidationCE.fs

@@ -6,8 +6,7 @@ open System
 module AsyncValidationCE =
 
     type AsyncValidationBuilder() =
-        member inline _.Return(value: 'ok) : AsyncValidation<'ok, 'error> =
-            AsyncValidation.singleton value
+        member inline _.Return(value: 'ok) : AsyncValidation<'ok, 'error> = AsyncValidation.ok value
 
         member inline _.ReturnFrom
             (result: AsyncValidation<'ok, 'error>)
@@ -110,7 +109,7 @@ module AsyncValidationCE =
             member inline _.Source(a: Async<'ok>) : AsyncValidation<'ok, 'error> =
                 async {
                     let! result = a
-                    return! AsyncValidation.singleton result
+                    return! AsyncValidation.ok result
                 }
 
             /// <summary>

src/FsToolkit.ErrorHandling/List.fs

@@ -48,7 +48,7 @@ module List =
     let sequenceResultM xs = traverseResultM id xs
 
     let traverseAsyncResultM f xs =
-        traverseAsyncResultM' (AsyncResult.singleton []) f xs
+        traverseAsyncResultM' (AsyncResult.ok []) f xs
 
     let sequenceAsyncResultM xs = traverseAsyncResultM id xs
 
@@ -77,8 +77,7 @@ module List =
                 let! fR = f x
 
                 match s, fR with
-                | Ok ys, Ok y ->
-                    return! traverseAsyncResultA' (AsyncResult.singleton (y :: ys)) f xs
+                | Ok ys, Ok y -> return! traverseAsyncResultA' (AsyncResult.ok (y :: ys)) f xs
                 | Error errs, Error e ->
                     return! traverseAsyncResultA' (AsyncResult.returnError (e :: errs)) f xs
                 | Ok _, Error e ->
@@ -116,7 +115,7 @@ module List =
     let sequenceValidationA xs = traverseValidationA id xs
 
     let traverseAsyncResultA f xs =
-        traverseAsyncResultA' (AsyncResult.singleton []) f xs
+        traverseAsyncResultA' (AsyncResult.ok []) f xs
 
     let sequenceAsyncResultA xs = traverseAsyncResultA id xs
 
@@ -176,7 +175,7 @@ module List =
     let sequenceOptionM xs = traverseOptionM id xs
 
     let traverseAsyncOptionM f xs =
-        traverseAsyncOptionM' (AsyncOption.singleton []) f xs
+        traverseAsyncOptionM' (AsyncOption.some []) f xs
 
     let sequenceAsyncOptionM xs = traverseAsyncOptionM id xs
 

src/FsToolkit.ErrorHandling/TaskOption.fs

@@ -20,10 +20,10 @@ module TaskOption =
             return! t
         }
 
-    let inline singleton x = task { return Some x }
+    let inline some x = task { return Some x }
 
     let inline apply f x =
-        bind (fun f' -> bind (fun x' -> singleton (f' x')) x) f
+        bind (fun f' -> bind (fun x' -> some (f' x')) x) f
 
     let inline zip x1 x2 =
         Task.zip x1 x2

src/FsToolkit.ErrorHandling/TaskResult.fs

@@ -24,7 +24,7 @@ module TaskResult =
         |> Async.StartImmediateAsTask
         |> Task.map Result.ofChoice
 
-    let inline singleton x =
+    let inline ok x =
         Ok x
         |> Task.singleton
 
@@ -51,17 +51,17 @@ module TaskResult =
     /// <example>
     /// <code>
     ///     TaskResult.error "First" |> TaskResult.orElse (TaskResult.error "Second") // evaluates to Error ("Second")
-    ///     TaskResult.error "First" |> TaskResult.orElse (TaskResult.singleton "Second") // evaluates to Ok ("Second")
-    ///     TaskResult.singleton "First" |> TaskResult.orElse (TaskResult.error "Second") // evaluates to Ok ("First")
-    ///     TaskResult.singleton "First" |> TaskResult.orElse (TaskResult.singleton "Second") // evaluates to Ok ("First")
+    ///     TaskResult.error "First" |> TaskResult.orElse (TaskResult.ok "Second") // evaluates to Ok ("Second")
+    ///     TaskResult.ok "First" |> TaskResult.orElse (TaskResult.error "Second") // evaluates to Ok ("First")
+    ///     TaskResult.ok "First" |> TaskResult.orElse (TaskResult.ok "Second") // evaluates to Ok ("First")
     /// </code>
     /// </example>
     /// <returns>
     /// The result if the result is Ok, else returns <paramref name="ifError"/>.
     /// </returns>
     let inline orElse (ifError: Task<Result<'ok, 'error2>>) (result: Task<Result<'ok, 'error>>) =
         result
-        |> Task.bind (Result.either singleton (fun _ -> ifError))
+        |> Task.bind (Result.either ok (fun _ -> ifError))
 
     /// <summary>
     /// Returns <paramref name="result"/> if it is <c>Ok</c>, otherwise executes <paramref name="ifErrorFunc"/> and returns the result.
@@ -74,9 +74,9 @@ module TaskResult =
     /// <example>
     /// <code>
     ///     TaskResult.error "First" |> TaskResult.orElseWith (fun _ -> TaskResult.error "Second") // evaluates to Error ("Second")
-    ///     TaskResult.error "First" |> TaskResult.orElseWith (fun _ -> TaskResult.singleton "Second") // evaluates to Ok ("Second")
-    ///     TaskResult.singleton "First" |> TaskResult.orElseWith (fun _ -> TaskResult.error "Second") // evaluates to Ok ("First")
-    ///     TaskResult.singleton "First" |> TaskResult.orElseWith (fun _ -> TaskResult.singleton "Second") // evaluates to Ok ("First")
+    ///     TaskResult.error "First" |> TaskResult.orElseWith (fun _ -> TaskResult.ok "Second") // evaluates to Ok ("Second")
+    ///     TaskResult.ok "First" |> TaskResult.orElseWith (fun _ -> TaskResult.error "Second") // evaluates to Ok ("First")
+    ///     TaskResult.ok "First" |> TaskResult.orElseWith (fun _ -> TaskResult.ok "Second") // evaluates to Ok ("First")
     /// </code>
     /// </example>
     /// <returns>
@@ -87,7 +87,7 @@ module TaskResult =
         (result: Task<Result<'ok, 'error>>)
         =
         result
-        |> Task.bind (Result.either singleton ifErrorFunc)
+        |> Task.bind (Result.either ok ifErrorFunc)
 
     /// Replaces the wrapped value with unit
     let inline ignore<'ok, 'error> (tr: Task<Result<'ok, 'error>>) =