diff --git a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs index 1ff8ba5e..452ede54 100644 --- a/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs +++ b/src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs @@ -323,12 +323,6 @@ module CancellableTaskValidation = let x = Result.mapError List.singleton result fun _ -> Task.FromResult(x) - /// Lifts an item to a CancellableTaskValidation. - /// The item to be the ok result of the CancellableTaskValidation. - /// A CancellableTaskValidation with the item as the result. - let inline ok (item: 'ok) : CancellableTaskValidation<'ok, 'error> = - fun _ -> Task.FromResult(Ok item) - /// Lifts an item to a CancellableTaskValidation. /// The item to be the error result of the CancellableTaskValidation. /// A CancellableTaskValidation with the item as the result. @@ -338,11 +332,9 @@ module CancellableTaskValidation = let inline ofChoice (choice: Choice<'ok, 'error>) : CancellableTaskValidation<'ok, 'error> = match choice with - | Choice1Of2 x -> ok x + | Choice1Of2 x -> singleton x | Choice2Of2 x -> error x - let inline retn (value: 'ok) : CancellableTaskValidation<'ok, 'error> = ok value - let inline mapError ([] errorMapper: 'errorInput -> 'errorOutput) @@ -480,7 +472,7 @@ module CancellableTaskValidation = return! result - |> Result.either ok (fun _ -> ifError) + |> Result.either singleton (fun _ -> ifError) } let inline orElseWith @@ -493,7 +485,7 @@ module CancellableTaskValidation = return! match result with - | Ok x -> ok x + | Ok x -> singleton x | Error err -> ifErrorFunc err } @@ -928,7 +920,7 @@ module CTVMergeSourcesExtensionsTV1CV2 = ( left: 'Awaiter1, [] right: CancellationToken -> 'Awaiter2 - ) = + ) = this.Source( // cancellableTask.Run( // cancellableTask.Bind( @@ -950,17 +942,17 @@ module CTVMergeSourcesExtensionsTV1CV2 = let! struct (l1, r1) = cancellableTask.MergeSources(left, right) return Validation.zip l1 r1 } - // fun ct -> Awaitable.GetTaskAwaiter(IcedTasks.Polyfill.Task.Tasks.TaskBuilder.task { - // let r1 = right ct - // let l1 = left - // let! struct (l1, r1) = IcedTasks.Polyfill.Task.Tasks.TaskBuilder.task.MergeSources(l1, r1) + // fun ct -> Awaitable.GetTaskAwaiter(IcedTasks.Polyfill.Task.Tasks.TaskBuilder.task { + // let r1 = right ct + // let l1 = left + // let! struct (l1, r1) = IcedTasks.Polyfill.Task.Tasks.TaskBuilder.task.MergeSources(l1, r1) - // // let foo = cancellableTask.MergeSources(left, right) ct - // return Validation.zip l1 r1 - // }) - // |> ignore + // // let foo = cancellableTask.MergeSources(left, right) ct + // return Validation.zip l1 r1 + // }) + // |> ignore - // Unchecked.defaultof<_> + // Unchecked.defaultof<_> ) diff --git a/src/FsToolkit.ErrorHandling.JobResult/JobOption.fs b/src/FsToolkit.ErrorHandling.JobResult/JobOption.fs index 031163bc..4abc9747 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/JobOption.fs +++ b/src/FsToolkit.ErrorHandling.JobResult/JobOption.fs @@ -20,10 +20,10 @@ module JobOption = return! t } - let inline retn x = job { return Some x } + let inline singleton x = job { return Some x } let inline apply f x = - bind (fun f' -> bind (fun x' -> retn (f' x')) x) f + bind (fun f' -> bind (fun x' -> singleton (f' x')) x) f /// diff --git a/src/FsToolkit.ErrorHandling.JobResult/JobResult.fs b/src/FsToolkit.ErrorHandling.JobResult/JobResult.fs index 8c857cbc..63b8c4e6 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/JobResult.fs +++ b/src/FsToolkit.ErrorHandling.JobResult/JobResult.fs @@ -39,12 +39,10 @@ module JobResult = |> Job.catch |> Job.map Result.ofChoice - let inline retn x = + let inline singleton x = Ok x |> Job.result - let inline ok x = retn x - let inline returnError x = Error x |> Job.result @@ -68,9 +66,9 @@ module JobResult = /// /// /// JobResult.error "First" |> JobResult.orElse (JobResult.error "Second") // evaluates to Error ("Second") - /// JobResult.error "First" |> JobResult.orElse (JobResult.ok "Second") // evaluates to Ok ("Second") - /// JobResult.ok "First" |> JobResult.orElse (JobResult.error "Second") // evaluates to Ok ("First") - /// JobResult.ok "First" |> JobResult.orElse (JobResult.ok "Second") // evaluates to Ok ("First") + /// JobResult.error "First" |> JobResult.orElse (JobResult.singleton "Second") // evaluates to Ok ("Second") + /// JobResult.singleton "First" |> JobResult.orElse (JobResult.error "Second") // evaluates to Ok ("First") + /// JobResult.singleton "First" |> JobResult.orElse (JobResult.singleton "Second") // evaluates to Ok ("First") /// /// /// @@ -78,7 +76,7 @@ module JobResult = /// let inline orElse (ifError: Job>) (result: Job>) = result - |> Job.bind (Result.either ok (fun _ -> ifError)) + |> Job.bind (Result.either singleton (fun _ -> ifError)) /// /// Returns if it is Ok, otherwise executes and returns the result. @@ -91,9 +89,9 @@ module JobResult = /// /// /// JobResult.error "First" |> JobResult.orElseWith (fun _ -> JobResult.error "Second") // evaluates to Error ("Second") - /// JobResult.error "First" |> JobResult.orElseWith (fun _ -> JobResult.ok "Second") // evaluates to Ok ("Second") - /// JobResult.ok "First" |> JobResult.orElseWith (fun _ -> JobResult.error "Second") // evaluates to Ok ("First") - /// JobResult.ok "First" |> JobResult.orElseWith (fun _ -> JobResult.ok "Second") // evaluates to Ok ("First") + /// JobResult.error "First" |> JobResult.orElseWith (fun _ -> JobResult.singleton "Second") // evaluates to Ok ("Second") + /// JobResult.singleton "First" |> JobResult.orElseWith (fun _ -> JobResult.error "Second") // evaluates to Ok ("First") + /// JobResult.singleton "First" |> JobResult.orElseWith (fun _ -> JobResult.singleton "Second") // evaluates to Ok ("First") /// /// /// @@ -104,7 +102,7 @@ module JobResult = (result: Job>) = result - |> Job.bind (Result.either ok ifErrorFunc) + |> Job.bind (Result.either singleton ifErrorFunc) /// Replaces the wrapped value with unit let inline ignore<'ok, 'error> (jr: Job>) = diff --git a/src/FsToolkit.ErrorHandling.JobResult/JobResultOption.fs b/src/FsToolkit.ErrorHandling.JobResult/JobResultOption.fs index 09babb21..433539ed 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/JobResultOption.fs +++ b/src/FsToolkit.ErrorHandling.JobResult/JobResultOption.fs @@ -9,7 +9,7 @@ module JobResultOption = let binder opt = match opt with | Some x -> f x - | None -> JobResult.retn None + | None -> JobResult.singleton None JobResult.bind binder jro @@ -19,7 +19,7 @@ module JobResultOption = let inline map3 ([] f) xJRO yJRO zJRO = JobResult.map3 (Option.map3 f) xJRO yJRO zJRO - let inline retn value = + let inline singleton value = Some value |> Ok |> Job.result diff --git a/src/FsToolkit.ErrorHandling.JobResult/JobResultOptionCE.fs b/src/FsToolkit.ErrorHandling.JobResult/JobResultOptionCE.fs index 494890e3..a331c0c7 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/JobResultOptionCE.fs +++ b/src/FsToolkit.ErrorHandling.JobResult/JobResultOptionCE.fs @@ -5,7 +5,7 @@ module JobResultOptionCE = open Hopac type JobResultOptionBuilder() = - member inline _.Return value = JobResultOption.retn value + member inline _.Return value = JobResultOption.singleton value member inline _.ReturnFrom value = value member inline _.Bind(result, [] binder) = JobResultOption.bind binder result diff --git a/src/FsToolkit.ErrorHandling.JobResult/List.fs b/src/FsToolkit.ErrorHandling.JobResult/List.fs index c855d909..2f9405fe 100644 --- a/src/FsToolkit.ErrorHandling.JobResult/List.fs +++ b/src/FsToolkit.ErrorHandling.JobResult/List.fs @@ -24,7 +24,7 @@ module List = } let traverseJobResultM f xs = - traverseJobResultM' (JobResult.retn []) f xs + traverseJobResultM' (JobResult.singleton []) f xs let sequenceJobResultM xs = traverseJobResultM id xs @@ -40,7 +40,7 @@ module List = let! fR = f x match s, fR with - | Ok ys, Ok y -> return! traverseJobResultA' (JobResult.retn (y :: ys)) f xs + | Ok ys, Ok y -> return! traverseJobResultA' (JobResult.singleton (y :: ys)) f xs | Error errs, Error e -> return! traverseJobResultA' (JobResult.returnError (e :: errs)) f xs | Ok _, Error e -> return! traverseJobResultA' (JobResult.returnError [ e ]) f xs @@ -49,6 +49,6 @@ module List = let traverseJobResultA f xs = - traverseJobResultA' (JobResult.retn []) f xs + traverseJobResultA' (JobResult.singleton []) f xs let sequenceJobResultA xs = traverseJobResultA id xs diff --git a/src/FsToolkit.ErrorHandling/Array.fs b/src/FsToolkit.ErrorHandling/Array.fs index 6e6ed2da..78decbe4 100644 --- a/src/FsToolkit.ErrorHandling/Array.fs +++ b/src/FsToolkit.ErrorHandling/Array.fs @@ -53,7 +53,7 @@ module Array = let sequenceResultM xs = traverseResultM id xs let traverseAsyncResultM f xs = - traverseAsyncResultM' (AsyncResult.retn [||]) f xs + traverseAsyncResultM' (AsyncResult.ok [||]) f xs let sequenceAsyncResultM xs = traverseAsyncResultM id xs @@ -88,7 +88,7 @@ module Array = match s, fR with | Ok ys, Ok y -> - return! traverseAsyncResultA' (AsyncResult.retn (Array.append [| y |] ys)) f xs + return! traverseAsyncResultA' (AsyncResult.ok (Array.append [| y |] ys)) f xs | Error errs, Error e -> return! traverseAsyncResultA' @@ -127,7 +127,7 @@ module Array = let sequenceValidationA xs = traverseValidationA id xs let traverseAsyncResultA f xs = - traverseAsyncResultA' (AsyncResult.retn [||]) f xs + traverseAsyncResultA' (AsyncResult.ok [||]) f xs let sequenceAsyncResultA xs = traverseAsyncResultA id xs @@ -193,7 +193,7 @@ module Array = let sequenceOptionM xs = traverseOptionM id xs let traverseAsyncOptionM f xs = - traverseAsyncOptionM' (AsyncOption.retn [||]) f xs + traverseAsyncOptionM' (AsyncOption.some [||]) f xs let sequenceAsyncOptionM xs = traverseAsyncOptionM id xs diff --git a/src/FsToolkit.ErrorHandling/Async.fs b/src/FsToolkit.ErrorHandling/Async.fs index e7e4eae7..3705a91b 100644 --- a/src/FsToolkit.ErrorHandling/Async.fs +++ b/src/FsToolkit.ErrorHandling/Async.fs @@ -15,15 +15,6 @@ module Async = value |> async.Return - /// - /// Converts a value to an Async value - /// - /// The value to convert to an Async value. - /// The Async value. - let inline retn (value: 'value) : Async<'value> = - value - |> async.Return - /// /// Takes a transformation function and applies it to the value of an Async value. /// diff --git a/src/FsToolkit.ErrorHandling/AsyncOption.fs b/src/FsToolkit.ErrorHandling/AsyncOption.fs index 400adae6..f3725744 100644 --- a/src/FsToolkit.ErrorHandling/AsyncOption.fs +++ b/src/FsToolkit.ErrorHandling/AsyncOption.fs @@ -21,16 +21,13 @@ module AsyncOption = ) input - let inline retn (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' -> retn (f' x')) input) applier + bind (fun f' -> bind (fun x' -> some (f' x')) input) applier /// /// Returns result of running if it is Some, otherwise returns result of running diff --git a/src/FsToolkit.ErrorHandling/AsyncOptionCE.fs b/src/FsToolkit.ErrorHandling/AsyncOptionCE.fs index ccec9801..b18dfea4 100644 --- a/src/FsToolkit.ErrorHandling/AsyncOptionCE.fs +++ b/src/FsToolkit.ErrorHandling/AsyncOptionCE.fs @@ -7,7 +7,7 @@ open System module AsyncOptionCE = type AsyncOptionBuilder() = - member inline _.Return(value: 'value) : Async<'value option> = AsyncOption.retn value + member inline _.Return(value: 'value) : Async<'value option> = AsyncOption.some value member inline _.ReturnFrom(value: Async<'value option>) : Async<'value option> = value diff --git a/src/FsToolkit.ErrorHandling/AsyncResult.fs b/src/FsToolkit.ErrorHandling/AsyncResult.fs index 2ae3dec1..6fb07844 100644 --- a/src/FsToolkit.ErrorHandling/AsyncResult.fs +++ b/src/FsToolkit.ErrorHandling/AsyncResult.fs @@ -5,13 +5,10 @@ open System.Threading.Tasks [] module AsyncResult = - - let inline retn (value: 'ok) : Async> = + let inline ok (value: 'ok) : Async> = Ok value |> Async.singleton - let inline ok (value: 'ok) : Async> = retn value - let inline returnError (error: 'error) : Async> = Error error |> Async.singleton diff --git a/src/FsToolkit.ErrorHandling/AsyncResultOption.fs b/src/FsToolkit.ErrorHandling/AsyncResultOption.fs index 53353ed0..f950e3cc 100644 --- a/src/FsToolkit.ErrorHandling/AsyncResultOption.fs +++ b/src/FsToolkit.ErrorHandling/AsyncResultOption.fs @@ -20,7 +20,7 @@ module AsyncResultOption = (fun opt -> match opt with | Some x -> binder x - | None -> AsyncResult.retn None + | None -> AsyncResult.ok None ) input @@ -40,7 +40,8 @@ module AsyncResultOption = : Async> = AsyncResult.map3 (Option.map3 mapper) input1 input2 input3 - let inline retn (value: 'ok) : Async> = AsyncResult.retn (Some value) + let inline singleton (value: 'ok) : Async> = + AsyncResult.ok (Some value) let apply (applier: Async 'okOutput) option, 'error>>) diff --git a/src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs b/src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs index 3f6fbc28..e39dd584 100644 --- a/src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs +++ b/src/FsToolkit.ErrorHandling/AsyncResultOptionCE.fs @@ -8,7 +8,7 @@ module AsyncResultOptionCE = type AsyncResultOptionBuilder() = member inline _.Return(value: 'ok) : AsyncResultOption<'ok, 'error> = - AsyncResultOption.retn value + AsyncResultOption.singleton value member inline _.ReturnFrom (value: Async>) diff --git a/src/FsToolkit.ErrorHandling/AsyncValidation.fs b/src/FsToolkit.ErrorHandling/AsyncValidation.fs index d14560be..326005f4 100644 --- a/src/FsToolkit.ErrorHandling/AsyncValidation.fs +++ b/src/FsToolkit.ErrorHandling/AsyncValidation.fs @@ -5,6 +5,7 @@ type AsyncValidation<'ok, 'error> = Async> [] module AsyncValidation = + let inline ok (value: 'ok) : AsyncValidation<'ok, 'error> = Ok value |> async.Return @@ -42,8 +43,6 @@ module AsyncValidation = ) } - let inline retn (value: 'ok) : AsyncValidation<'ok, 'error> = ok value - let inline returnError (error: 'error) : AsyncValidation<'ok, 'error> = Error [ error ] |> async.Return diff --git a/src/FsToolkit.ErrorHandling/AsyncValidationCE.fs b/src/FsToolkit.ErrorHandling/AsyncValidationCE.fs index 7eef703a..a05d36d1 100644 --- 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. /// member inline _.Source(s: Validation<'ok, 'error>) : AsyncValidation<'ok, 'error> = - Async.retn s + Async.singleton s #if !FABLE_COMPILER diff --git a/src/FsToolkit.ErrorHandling/List.fs b/src/FsToolkit.ErrorHandling/List.fs index f3401c17..901258f5 100644 --- a/src/FsToolkit.ErrorHandling/List.fs +++ b/src/FsToolkit.ErrorHandling/List.fs @@ -48,7 +48,7 @@ module List = let sequenceResultM xs = traverseResultM id xs let traverseAsyncResultM f xs = - traverseAsyncResultM' (AsyncResult.retn []) f xs + traverseAsyncResultM' (AsyncResult.ok []) f xs let sequenceAsyncResultM xs = traverseAsyncResultM id xs @@ -77,7 +77,7 @@ module List = let! fR = f x match s, fR with - | Ok ys, Ok y -> return! traverseAsyncResultA' (AsyncResult.retn (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 -> @@ -115,7 +115,7 @@ module List = let sequenceValidationA xs = traverseValidationA id xs let traverseAsyncResultA f xs = - traverseAsyncResultA' (AsyncResult.retn []) f xs + traverseAsyncResultA' (AsyncResult.ok []) f xs let sequenceAsyncResultA xs = traverseAsyncResultA id xs @@ -175,7 +175,7 @@ module List = let sequenceOptionM xs = traverseOptionM id xs let traverseAsyncOptionM f xs = - traverseAsyncOptionM' (AsyncOption.retn []) f xs + traverseAsyncOptionM' (AsyncOption.some []) f xs let sequenceAsyncOptionM xs = traverseAsyncOptionM id xs diff --git a/src/FsToolkit.ErrorHandling/ResultOption.fs b/src/FsToolkit.ErrorHandling/ResultOption.fs index 3fac9cb7..e3c8a356 100644 --- a/src/FsToolkit.ErrorHandling/ResultOption.fs +++ b/src/FsToolkit.ErrorHandling/ResultOption.fs @@ -11,7 +11,7 @@ module ResultOption = /// /// The value to convert. /// The value wrapped in an Option and then wrapped in a Result. - let inline retn x = Ok(Some x) + let inline singleton x = Ok(Some x) /// /// Applies a transformation function to a Result value that contains an Option value. diff --git a/src/FsToolkit.ErrorHandling/ResultOptionCE.fs b/src/FsToolkit.ErrorHandling/ResultOptionCE.fs index 60b9db0f..7af5243a 100644 --- a/src/FsToolkit.ErrorHandling/ResultOptionCE.fs +++ b/src/FsToolkit.ErrorHandling/ResultOptionCE.fs @@ -6,7 +6,7 @@ open System module ResultOptionCE = type ResultOptionBuilder() = - member inline _.Return value = ResultOption.retn value + member inline _.Return value = ResultOption.singleton value member inline _.ReturnFrom value : Result<'ok option, 'error> = value diff --git a/src/FsToolkit.ErrorHandling/TaskOption.fs b/src/FsToolkit.ErrorHandling/TaskOption.fs index f3a30649..b314b0f3 100644 --- a/src/FsToolkit.ErrorHandling/TaskOption.fs +++ b/src/FsToolkit.ErrorHandling/TaskOption.fs @@ -20,11 +20,10 @@ module TaskOption = return! t } - let inline retn x = task { return Some x } let inline some x = task { return Some x } let inline apply f x = - bind (fun f' -> bind (fun x' -> retn (f' x')) x) f + bind (fun f' -> bind (fun x' -> some (f' x')) x) f let inline zip x1 x2 = Task.zip x1 x2 diff --git a/src/FsToolkit.ErrorHandling/TaskResult.fs b/src/FsToolkit.ErrorHandling/TaskResult.fs index 82b05e0b..5e52ace3 100644 --- a/src/FsToolkit.ErrorHandling/TaskResult.fs +++ b/src/FsToolkit.ErrorHandling/TaskResult.fs @@ -24,12 +24,10 @@ module TaskResult = |> Async.StartImmediateAsTask |> Task.map Result.ofChoice - let inline retn x = + let inline ok x = Ok x |> Task.singleton - let inline ok x = retn x - let inline returnError x = Error x |> Task.singleton diff --git a/src/FsToolkit.ErrorHandling/TaskResultOption.fs b/src/FsToolkit.ErrorHandling/TaskResultOption.fs index 411c3ec9..81dad95c 100644 --- a/src/FsToolkit.ErrorHandling/TaskResultOption.fs +++ b/src/FsToolkit.ErrorHandling/TaskResultOption.fs @@ -11,7 +11,7 @@ module TaskResultOption = let binder opt = match opt with | Some x -> f x - | None -> TaskResult.retn None + | None -> TaskResult.ok None TaskResult.bind binder tro @@ -21,7 +21,7 @@ module TaskResultOption = let inline map3 ([] f) xTRO yTRO zTRO = TaskResult.map3 (Option.map3 f) xTRO yTRO zTRO - let inline retn value = TaskResult.retn (Some value) + let inline singleton value = TaskResult.ok (Some value) let inline apply fTRO xTRO = map2 (fun f x -> f x) fTRO xTRO diff --git a/src/FsToolkit.ErrorHandling/Validation.fs b/src/FsToolkit.ErrorHandling/Validation.fs index dc896794..95f630cc 100644 --- a/src/FsToolkit.ErrorHandling/Validation.fs +++ b/src/FsToolkit.ErrorHandling/Validation.fs @@ -31,8 +31,6 @@ module Validation = @ errs2 ) - let inline retn (value: 'ok) : Validation<'ok, 'error> = ok value - let inline returnError (error: 'error) : Validation<'ok, 'error> = Error [ error ] diff --git a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs index 1d402a8c..a530445f 100644 --- a/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs +++ b/tests/FsToolkit.ErrorHandling.IcedTasks.Tests/CancellableTaskValidationCE.fs @@ -1325,7 +1325,7 @@ module CancellableTaskValidationCE = cancellableTaskValidation { let! a = Ok 3 and! b = Choice1Of2 2 - and! c = CancellableTaskValidation.ok 1 + and! c = CancellableTaskValidation.singleton 1 return a + b - c } @@ -1399,8 +1399,8 @@ module CancellableTaskValidationCE = let actual = cancellableTaskValidation { - let! a = CancellableTaskValidation.ok 3 - and! b = CancellableTaskValidation.ok 2 + let! a = CancellableTaskValidation.singleton 3 + and! b = CancellableTaskValidation.singleton 2 and! c = expected return a + b - c } @@ -1612,7 +1612,7 @@ module CancellableTaskValidationCE = testList "singleton" [ testCaseAsync "Simple" <| async { - let innerCall = CancellableTaskValidation.ok "lol" + let innerCall = CancellableTaskValidation.singleton "lol" let! someTask = innerCall @@ -2089,7 +2089,7 @@ module CancellableTaskValidationCE = let f res = cancellableTaskValidation { return! res } - f (CancellableTaskValidation.ok (())) + f (CancellableTaskValidation.singleton (())) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOption.fs b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOption.fs index 4626fa8c..f93d3856 100644 --- a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOption.fs +++ b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOption.fs @@ -87,7 +87,7 @@ let retnTests = testList "JobOption.retn Tests" [ testCase "retn with x" <| fun _ -> - JobOption.retn 267 + JobOption.singleton 267 |> Expect.hasJobSomeValue (267) ] @@ -123,7 +123,7 @@ let eitherTests = testList "JobOption.either Tests" [ testCaseJob "Some" <| job { - let value1 = JobOption.retn 5 + let value1 = JobOption.singleton 5 let f = job.Return 42 let add2 x = job { return x + 2 } let! result = (JobOption.either add2 f value1) diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOptionCE.fs b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOptionCE.fs index dce8ba7f..fac93b77 100644 --- a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOptionCE.fs +++ b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobOptionCE.fs @@ -342,6 +342,6 @@ let ``JobOptionCE inference checks`` = // Compilation is success let f res = jobOption { return! res } - f (JobOption.retn ()) + f (JobOption.singleton ()) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResult.fs b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResult.fs index d29f96f2..793d49d4 100644 --- a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResult.fs +++ b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResult.fs @@ -148,14 +148,14 @@ let orElseTests = testCaseJob "Ok Ok takes first Ok" <| job { return! - JobResult.ok "First" - |> JobResult.orElse (JobResult.ok "Second") + JobResult.singleton "First" + |> JobResult.orElse (JobResult.singleton "Second") |> Expect.hasJobOkValue "First" } testCaseJob "Ok Error takes first Ok" <| job { return! - JobResult.ok "First" + JobResult.singleton "First" |> JobResult.orElse (JobResult.error "Second") |> Expect.hasJobOkValue "First" } @@ -163,7 +163,7 @@ let orElseTests = <| job { return! JobResult.error "First" - |> JobResult.orElse (JobResult.ok "Second") + |> JobResult.orElse (JobResult.singleton "Second") |> Expect.hasJobOkValue "Second" } testCaseJob "Error Error takes second error" @@ -181,14 +181,14 @@ let orElseWithTests = testCaseJob "Ok Ok takes first Ok" <| job { return! - JobResult.ok "First" - |> JobResult.orElseWith (fun _ -> JobResult.ok "Second") + JobResult.singleton "First" + |> JobResult.orElseWith (fun _ -> JobResult.singleton "Second") |> Expect.hasJobOkValue "First" } testCaseJob "Ok Error takes first Ok" <| job { return! - JobResult.ok "First" + JobResult.singleton "First" |> JobResult.orElseWith (fun _ -> JobResult.error "Second") |> Expect.hasJobOkValue "First" } @@ -196,7 +196,7 @@ let orElseWithTests = <| job { return! JobResult.error "First" - |> JobResult.orElseWith (fun _ -> JobResult.ok "Second") + |> JobResult.orElseWith (fun _ -> JobResult.singleton "Second") |> Expect.hasJobOkValue "Second" } testCaseJob "Error Error takes second error" @@ -755,7 +755,7 @@ let bindRequireTests = <| job { return! Some "john_doe" - |> JobResult.ok + |> JobResult.singleton |> JobResult.bindRequireNone "user exists" |> Expect.hasJobErrorValue "user exists" } @@ -764,7 +764,7 @@ let bindRequireTests = <| job { return! Some "john_doe" - |> JobResult.ok + |> JobResult.singleton |> JobResult.bindRequireSome "user doesn't exists" |> Expect.hasJobOkValue "john_doe" } @@ -777,7 +777,7 @@ let bindRequireValueOptionTests = <| job { return! ValueSome "john_doe" - |> JobResult.ok + |> JobResult.singleton |> JobResult.bindRequireValueNone "user exists" |> Expect.hasJobErrorValue "user exists" } @@ -786,7 +786,7 @@ let bindRequireValueOptionTests = <| job { return! ValueSome "john_doe" - |> JobResult.ok + |> JobResult.singleton |> JobResult.bindRequireValueSome "user doesn't exists" |> Expect.hasJobOkValue "john_doe" } diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultCE.fs b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultCE.fs index 50ca1e7c..817dafc4 100644 --- a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultCE.fs +++ b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultCE.fs @@ -432,9 +432,9 @@ let ``AsyncResultCE applicative tests`` = <| job { let! actual = jobResult { - let! a = JobResult.retn 3 - and! b = JobResult.retn 2 - and! c = JobResult.retn 1 + let! a = JobResult.singleton 3 + and! b = JobResult.singleton 2 + and! c = JobResult.singleton 1 return a + b - c } @@ -444,9 +444,9 @@ let ``AsyncResultCE applicative tests`` = <| job { let! actual = jobResult { - let! a = AsyncResult.retn 3 - and! b = AsyncResult.retn 2 - and! c = AsyncResult.retn 1 + let! a = AsyncResult.ok 3 + and! b = AsyncResult.ok 2 + and! c = AsyncResult.ok 1 return a + b - c } @@ -457,9 +457,9 @@ let ``AsyncResultCE applicative tests`` = <| job { let! actual = jobResult { - let! a = TaskResult.retn 3 - and! b = TaskResult.retn 2 - and! c = TaskResult.retn 1 + let! a = TaskResult.ok 3 + and! b = TaskResult.ok 2 + and! c = TaskResult.ok 1 return a + b - c } @@ -606,6 +606,6 @@ let ``JobResultCE inference checks`` = // Compilation is success let f res = jobResult { return! res } - f (JobResult.retn ()) + f (JobResult.singleton ()) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultOption.fs b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultOption.fs index 8357f3bf..aced1260 100644 --- a/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultOption.fs +++ b/tests/FsToolkit.ErrorHandling.JobResult.Tests/JobResultOption.fs @@ -264,6 +264,6 @@ let ``JobResultOptionCE inference checks`` = // Compilation is success let f res = jobResultOption { return! res } - f (JobResult.retn ()) + f (JobResult.singleton ()) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/BackgroundTaskResultCE.fs b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/BackgroundTaskResultCE.fs index 3931288d..977633e6 100644 --- a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/BackgroundTaskResultCE.fs +++ b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/BackgroundTaskResultCE.fs @@ -526,9 +526,9 @@ let ``BackgroundTaskResultCE applicative tests`` = backgroundTask { let! actual = backgroundTaskResult { - let! a = TaskResult.retn 3 - and! b = TaskResult.retn 2 - and! c = TaskResult.retn 1 + let! a = TaskResult.ok 3 + and! b = TaskResult.ok 2 + and! c = TaskResult.ok 1 return a + b - c } @@ -540,9 +540,9 @@ let ``BackgroundTaskResultCE applicative tests`` = backgroundTask { let! actual = backgroundTaskResult { - let! a = AsyncResult.retn 3 - and! b = AsyncResult.retn 2 - and! c = AsyncResult.retn 1 + let! a = AsyncResult.ok 3 + and! b = AsyncResult.ok 2 + and! c = AsyncResult.ok 1 return a + b - c } diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskOption.fs b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskOption.fs index 452b06cd..89666d41 100644 --- a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskOption.fs +++ b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskOption.fs @@ -97,7 +97,7 @@ let retnTests = testList "TaskOption.retn Tests" [ testCase "retn with x" <| fun _ -> - TaskOption.retn 267 + TaskOption.some 267 |> Expect.hasTaskSomeValue (267) ] @@ -134,7 +134,7 @@ let eitherTests = testCaseTask "Some" <| fun () -> task { - let value1 = TaskOption.retn 5 + let value1 = TaskOption.some 5 let f () = Task.FromResult 42 let add2 x = task { return x + 2 } let! result = (TaskOption.either add2 f value1) @@ -159,7 +159,7 @@ let defaultValueTests = let defaultValue = 10 let expectedValue = 5 - let taskOption = TaskOption.retn expectedValue + let taskOption = TaskOption.some expectedValue let! result = TaskOption.defaultValue defaultValue taskOption Expect.equal result expectedValue "" } @@ -182,7 +182,7 @@ let defaultWithTests = let defaultValue = 10 let expectedValue = 5 - let taskOption = TaskOption.retn expectedValue + let taskOption = TaskOption.some expectedValue let! result = TaskOption.defaultWith (fun () -> defaultValue) taskOption Expect.equal result expectedValue "" } diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultCE.fs b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultCE.fs index ce590d29..a0ef0180 100644 --- a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultCE.fs +++ b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultCE.fs @@ -568,9 +568,9 @@ let ``TaskResultCE applicative tests`` = task { let! actual = taskResult { - let! a = TaskResult.retn 3 - and! b = TaskResult.retn 2 - and! c = TaskResult.retn 1 + let! a = TaskResult.ok 3 + and! b = TaskResult.ok 2 + and! c = TaskResult.ok 1 return a + b - c } @@ -582,9 +582,9 @@ let ``TaskResultCE applicative tests`` = task { let! actual = taskResult { - let! a = AsyncResult.retn 3 - and! b = AsyncResult.retn 2 - and! c = AsyncResult.retn 1 + let! a = AsyncResult.ok 3 + and! b = AsyncResult.ok 2 + and! c = AsyncResult.ok 1 return a + b - c } @@ -748,6 +748,6 @@ let ``TaskResultCE inference checks`` = // Compilation is success let f res = taskResult { return! res () } - f (TaskResult.retn) + f (TaskResult.ok) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultOption.fs b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultOption.fs index 860b40fa..7dcefff2 100644 --- a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultOption.fs +++ b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/TaskResultOption.fs @@ -265,6 +265,6 @@ let ``TaskResultOptionCE inference checks`` = // Compilation is success let f res = taskResultOption { return! res } - f (TaskResultOption.retn ()) + f (TaskResultOption.singleton ()) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.Tests/AsyncOption.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncOption.fs index 41274465..a6c3bfa0 100644 --- a/tests/FsToolkit.ErrorHandling.Tests/AsyncOption.fs +++ b/tests/FsToolkit.ErrorHandling.Tests/AsyncOption.fs @@ -72,7 +72,7 @@ let applyTests = let retnTests = testList "AsyncOption.retn Tests" [ testCaseAsync "retn with x" - <| (AsyncOption.retn 267 + <| (AsyncOption.some 267 |> Expect.hasAsyncSomeValue (267)) ] @@ -111,7 +111,7 @@ let eitherTests = testList "AsyncOption.either Tests" [ testCaseAsync "Some" <| async { - let value1 = AsyncOption.retn 5 + let value1 = AsyncOption.some 5 let f = async.Return 42 let add2 x = async { return x + 2 } let! result = (AsyncOption.either add2 f value1) @@ -134,7 +134,7 @@ let defaultValueTests = let defaultValue = 10 let expectedValue = 5 - let asyncOption = AsyncOption.retn expectedValue + let asyncOption = AsyncOption.some expectedValue let! result = AsyncOption.defaultValue defaultValue asyncOption Expect.equal result expectedValue "" } @@ -155,7 +155,7 @@ let defaultWithTests = let defaultValue = 10 let expectedValue = 5 - let asyncOption = AsyncOption.retn expectedValue + let asyncOption = AsyncOption.some expectedValue let! result = AsyncOption.defaultWith (fun () -> defaultValue) asyncOption Expect.equal result expectedValue "" } diff --git a/tests/FsToolkit.ErrorHandling.Tests/AsyncOptionCE.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncOptionCE.fs index 13a40b44..a924f644 100644 --- 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/AsyncResultCE.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncResultCE.fs index da5949dd..5702e388 100644 --- a/tests/FsToolkit.ErrorHandling.Tests/AsyncResultCE.fs +++ b/tests/FsToolkit.ErrorHandling.Tests/AsyncResultCE.fs @@ -588,7 +588,7 @@ let ``AsyncResultCE inference checks`` = // Compilation is success let f res = asyncResult { return! res } - f (AsyncResult.retn ()) + f (AsyncResult.ok ()) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.Tests/AsyncResultOptionCE.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncResultOptionCE.fs index 5997ee3c..06a5bc47 100644 --- a/tests/FsToolkit.ErrorHandling.Tests/AsyncResultOptionCE.fs +++ b/tests/FsToolkit.ErrorHandling.Tests/AsyncResultOptionCE.fs @@ -72,7 +72,7 @@ let ``AsyncResultOptionCE return! Tests`` = testCaseAsync "Return Ok AsyncResultOption" <| async { let innerData = "Foo" - let data = AsyncResultOption.retn innerData + let data = AsyncResultOption.singleton innerData let! actual = asyncResultOption { return! data } Expect.equal actual (OkSome innerData) "Should be ok" @@ -81,7 +81,7 @@ let ``AsyncResultOptionCE return! Tests`` = testCaseAsync "Return Ok AsyncResult" <| async { let innerData = "Foo" - let data = AsyncResult.retn innerData + let data = AsyncResult.ok innerData let! actual = asyncResultOption { return! data } Expect.equal actual (OkSome innerData) "Should be ok" @@ -89,7 +89,7 @@ let ``AsyncResultOptionCE return! Tests`` = testCaseAsync "Return Ok AsyncOption" <| async { let innerData = "Foo" - let data = AsyncOption.retn innerData + let data = AsyncOption.some innerData let! actual = asyncResultOption { return! data } Expect.equal actual (OkSome innerData) "Should be ok" @@ -274,7 +274,7 @@ let ``AsyncResultOptionCE bind Tests`` = <| async { let innerData = "Foo" - let data = AsyncResultOption.retn innerData + let data = AsyncResultOption.singleton innerData let! actual = asyncResultOption { @@ -714,7 +714,7 @@ let ``AsyncResultOptionCE inference checks`` = // Compilation is success let f res = asyncResultOption { return! res } - f (AsyncResultOption.retn ()) + f (AsyncResultOption.singleton ()) |> ignore ] diff --git a/tests/FsToolkit.ErrorHandling.Tests/AsyncValidation.fs b/tests/FsToolkit.ErrorHandling.Tests/AsyncValidation.fs index 87fba1b8..5502ecb8 100644 --- 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