Skip to content

Commit ce4374b

Browse files
NinoFlorisTheAngryByrd
authored andcommitted
Port TaskResult to Ply
1 parent 782922b commit ce4374b

23 files changed

+251
-288
lines changed

paket.dependencies

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ source https://api.nuget.org/v3/index.json
22

33

44
storage: none
5+
nuget FSharp.Core 4.6.2
56
nuget Hopac
67
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
78
nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true # allows for building full framework on macOS/linux without mono
8-
nuget TaskBuilder.fs
9+
nuget Ply
910

1011
group Test
1112
source https://api.nuget.org/v3/index.json
@@ -28,4 +29,4 @@ nuget Fake.DotNet.Testing.Expecto 5.20.0
2829
nuget Fake.Tools.Git 5.20.0
2930
nuget Fake.JavaScript.Npm 5.20.0
3031
nuget Fake.Api.GitHub 5.20.0
31-
nuget Paket.Core 6.0.0-alpha022
32+
nuget Paket.Core 6.0.0-alpha022

paket.lock

Lines changed: 29 additions & 36 deletions
Large diffs are not rendered by default.

src/FsToolkit.ErrorHandling.JobResult/FsToolkit.ErrorHandling.JobResult.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<DebugType>portable</DebugType>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
TaskBuilder.fs
21
Microsoft.SourceLink.GitHub
32
Hopac
43
Microsoft.NETFramework.ReferenceAssemblies

src/FsToolkit.ErrorHandling.TaskResult/FsToolkit.ErrorHandling.TaskResult.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<DebugType>portable</DebugType>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>

src/FsToolkit.ErrorHandling.TaskResult/List.fs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
namespace FsToolkit.ErrorHandling
2+
23
open System.Threading.Tasks
34
open FsToolkit.ErrorHandling
4-
open FSharp.Control.Tasks.V2.ContextInsensitive
5+
open FSharp.Control.Tasks
56

67
[<RequireQualifiedAccess>]
78
module List =
@@ -55,4 +56,4 @@ module List =
5556
traverseTaskResultA' f xs
5657

5758
let sequenceTaskResultA xs =
58-
traverseTaskResultA id xs
59+
traverseTaskResultA id xs

src/FsToolkit.ErrorHandling.TaskResult/Result.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace FsToolkit.ErrorHandling
22

33
open System.Threading.Tasks
4-
open FSharp.Control.Tasks.V2.ContextInsensitive
4+
open FSharp.Control.Tasks
55

66
module Result =
77

src/FsToolkit.ErrorHandling.TaskResult/Task.fs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
namespace FsToolkit.ErrorHandling
22

33
open System.Threading.Tasks
4-
open FSharp.Control.Tasks.V2.ContextInsensitive
5-
4+
open FSharp.Control.Tasks
65

76
[<RequireQualifiedAccess>]
87
module Task =
@@ -33,4 +32,4 @@ module Task =
3332
return r1,r2
3433
}
3534

36-
let ofUnit (t : Task) = task { return! t }
35+
let ofUnit (t : Task) = task { return! t }
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
namespace FsToolkit.ErrorHandling.Operator.Task
2+
23
open FsToolkit.ErrorHandling
34

45
[<AutoOpen>]
56
module Task =
67
let inline (<!>) f x = Task.map f x
78
let inline (<*>) f x = Task.apply f x
8-
let inline (>>=) x f = Task.bind f x
9+
let inline (>>=) x f = Task.bind f x

src/FsToolkit.ErrorHandling.TaskResult/TaskOption.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace FsToolkit.ErrorHandling
22

33
open System.Threading.Tasks
4-
open FSharp.Control.Tasks.V2.ContextInsensitive
4+
open FSharp.Control.Tasks
55

66
[<RequireQualifiedAccess>]
77
module TaskOption =
@@ -24,4 +24,4 @@ module TaskOption =
2424

2525
let apply f x =
2626
bind (fun f' ->
27-
bind (fun x' -> retn (f' x')) x) f
27+
bind (fun x' -> retn (f' x')) x) f

0 commit comments

Comments
 (0)