Skip to content

and! support in TaskBulder #18451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Apr 17, 2025
Merged

and! support in TaskBulder #18451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5defb31
`and!` support in TaskBulder draft
Lanayx Apr 7, 2025
be25c98
Moved MergeSources from base class to implementation
Lanayx Apr 7, 2025
0d61b91
Moved MergeSources methods once again
Lanayx Apr 7, 2025
a527f88
Fix build
Lanayx Apr 7, 2025
a0f9631
Added more tests
Lanayx Apr 7, 2025
5abafa2
Added try-with test and release notes. Mixed async oveloads are TODO …
Lanayx Apr 11, 2025
8bab0ec
Final version for taskbuilder
Lanayx Apr 11, 2025
0237e63
Added BackgroundTaskBuilder and tests
Lanayx Apr 11, 2025
870afc4
Fantomas formatting
Lanayx Apr 11, 2025
8ab0379
Fixed release notes location
Lanayx Apr 11, 2025
a385fac
Updated tuples to struct tuples to reduce allocations a little bit
Lanayx Apr 11, 2025
2bbfc08
Updated surface area
Lanayx Apr 11, 2025
ecd0a73
Fixed typo
Lanayx Apr 11, 2025
d6d8ba7
Updated surface area
Lanayx Apr 11, 2025
28d1ae3
Try updating ILVerify files for Fshap.Core only
Lanayx Apr 11, 2025
7837cc3
Update docs/release-notes/.FSharp.Core/9.0.300.md
T-Gro Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/release-notes/.FSharp.Core/9.0.300.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

### Added
* Added nullability annotations to `.Using` builder method for `async` and `task` builders ([PR #18292](https://github.com/dotnet/fsharp/pull/18292))
* Support for `and!` in `TaskBuilder` ([LanguageSuggestion #1363](https://github.com/fsharp/fslang-suggestions/issues/1363), [PR #18451](https://github.com/dotnet/fsharp/pull/18451))

### Changed

Expand Down
1 change: 1 addition & 0 deletions src/FSharp.Core/fslib-extra-pervasives.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ module ExtraTopLevelOperators =
[<assembly: AutoOpen("Microsoft.FSharp.Collections")>]
[<assembly: AutoOpen("Microsoft.FSharp.Control")>]
[<assembly: AutoOpen("Microsoft.FSharp.Control.TaskBuilderExtensions.LowPriority")>]
[<assembly: AutoOpen("Microsoft.FSharp.Control.TaskBuilderExtensions.LowPlusPriority")>]
[<assembly: AutoOpen("Microsoft.FSharp.Control.TaskBuilderExtensions.MediumPriority")>]
[<assembly: AutoOpen("Microsoft.FSharp.Control.TaskBuilderExtensions.HighPriority")>]
[<assembly: AutoOpen("Microsoft.FSharp.Linq.QueryRunExtensions.LowPriority")>]
Expand Down
280 changes: 280 additions & 0 deletions src/FSharp.Core/tasks.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,48 @@ module LowPriority =
=
ResumableCode.Using(resource, body)

type TaskBuilder with
member inline this.MergeSources< ^TaskLike1, ^TaskLike2, ^TResult1, ^TResult2, ^Awaiter1, ^Awaiter2
when ^TaskLike1: (member GetAwaiter: unit -> ^Awaiter1)
and ^TaskLike2: (member GetAwaiter: unit -> ^Awaiter2)
and ^Awaiter1 :> ICriticalNotifyCompletion
and ^Awaiter2 :> ICriticalNotifyCompletion
and ^Awaiter1: (member get_IsCompleted: unit -> bool)
and ^Awaiter1: (member GetResult: unit -> ^TResult1)
and ^Awaiter2: (member get_IsCompleted: unit -> bool)
and ^Awaiter2: (member GetResult: unit -> ^TResult2)>
(task1: ^TaskLike1, task2: ^TaskLike2)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

type BackgroundTaskBuilder with
member inline this.MergeSources< ^TaskLike1, ^TaskLike2, ^TResult1, ^TResult2, ^Awaiter1, ^Awaiter2
when ^TaskLike1: (member GetAwaiter: unit -> ^Awaiter1)
and ^TaskLike2: (member GetAwaiter: unit -> ^Awaiter2)
and ^Awaiter1 :> ICriticalNotifyCompletion
and ^Awaiter2 :> ICriticalNotifyCompletion
and ^Awaiter1: (member get_IsCompleted: unit -> bool)
and ^Awaiter1: (member GetResult: unit -> ^TResult1)
and ^Awaiter2: (member get_IsCompleted: unit -> bool)
and ^Awaiter2: (member GetResult: unit -> ^TResult2)>
(task1: ^TaskLike1, task2: ^TaskLike2)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

module HighPriority =

// High priority extensions
type TaskBuilderBase with

Expand Down Expand Up @@ -424,7 +465,36 @@ module HighPriority =
member inline this.ReturnFrom(task: Task<'T>) : TaskCode<'T, 'T> =
this.Bind(task, this.Return)

type TaskBuilder with

// This overload is required for type inference in tasks cases
member inline this.MergeSources
(task1: Task< ^TResult1 >, task2: Task< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

type BackgroundTaskBuilder with

// This overload is required for type inference in tasks cases
member inline this.MergeSources
(task1: Task< ^TResult1 >, task2: Task< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

module MediumPriority =
open LowPriority
open HighPriority

// Medium priority extensions
Expand All @@ -437,3 +507,213 @@ module MediumPriority =

member inline this.ReturnFrom(computation: Async<'T>) : TaskCode<'T, 'T> =
this.ReturnFrom(Async.StartImmediateAsTask computation)

type TaskBuilder with

// This overload is required for type inference in tasks cases
member inline this.MergeSources< ^TaskLike2, ^TResult1, ^TResult2, ^Awaiter2
when ^TaskLike2: (member GetAwaiter: unit -> ^Awaiter2)
and ^Awaiter2 :> ICriticalNotifyCompletion
and ^Awaiter2: (member get_IsCompleted: unit -> bool)
and ^Awaiter2: (member GetResult: unit -> 'TResult2)>
(task1: Task< ^TResult1 >, task2: ^TaskLike2)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in tasks cases
member inline this.MergeSources< ^TaskLike1, ^TResult1, ^TResult2, ^Awaiter1
when ^TaskLike1: (member GetAwaiter: unit -> ^Awaiter1)
and ^Awaiter1 :> ICriticalNotifyCompletion
and ^Awaiter1: (member get_IsCompleted: unit -> bool)
and ^Awaiter1: (member GetResult: unit -> 'TResult1)>
(task1: ^TaskLike1, task2: Task< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in async cases
member inline this.MergeSources
(computation1: Async< ^TResult1 >, computation2: Async< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
computation1,
fun (result1: ^TResult1) ->
this.Bind(computation2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in task + async cases
member inline this.MergeSources
(task: Task< ^TResult1 >, computation: Async< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task,
fun (result1: ^TResult1) ->
this.Bind(computation, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in async + task case
member inline this.MergeSources
(computation: Async< ^TResult1 >, task: Task< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
computation,
fun (result1: ^TResult1) ->
this.Bind(task, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

type BackgroundTaskBuilder with

// This overload is required for type inference in tasks cases
member inline this.MergeSources< ^TaskLike2, ^TResult1, ^TResult2, ^Awaiter2
when ^TaskLike2: (member GetAwaiter: unit -> ^Awaiter2)
and ^Awaiter2 :> ICriticalNotifyCompletion
and ^Awaiter2: (member get_IsCompleted: unit -> bool)
and ^Awaiter2: (member GetResult: unit -> 'TResult2)>
(task1: Task< ^TResult1 >, task2: ^TaskLike2)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in tasks cases
member inline this.MergeSources< ^TaskLike1, ^TResult1, ^TResult2, ^Awaiter1
when ^TaskLike1: (member GetAwaiter: unit -> ^Awaiter1)
and ^Awaiter1 :> ICriticalNotifyCompletion
and ^Awaiter1: (member get_IsCompleted: unit -> bool)
and ^Awaiter1: (member GetResult: unit -> 'TResult1)>
(task1: ^TaskLike1, task2: Task< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task1,
fun (result1: ^TResult1) ->
this.Bind(task2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in async cases
member inline this.MergeSources
(computation1: Async< ^TResult1 >, computation2: Async< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
computation1,
fun (result1: ^TResult1) ->
this.Bind(computation2, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in task + async cases
member inline this.MergeSources
(task: Task< ^TResult1 >, computation: Async< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task,
fun (result1: ^TResult1) ->
this.Bind(computation, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in async + task case
member inline this.MergeSources
(computation: Async< ^TResult1 >, task: Task< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
computation,
fun (result1: ^TResult1) ->
this.Bind(task, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

module LowPlusPriority =
open LowPriority
open MediumPriority

type TaskBuilder with
// This overload is required for type inference in async cases
member inline this.MergeSources< ^TaskLike2, ^TResult1, ^TResult2, ^Awaiter2
when ^TaskLike2: (member GetAwaiter: unit -> ^Awaiter2)
and ^Awaiter2 :> ICriticalNotifyCompletion
and ^Awaiter2: (member get_IsCompleted: unit -> bool)
and ^Awaiter2: (member GetResult: unit -> 'TResult2)>
(computation: Async< ^TResult1 >, task: ^TaskLike2)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
computation,
fun (result1: ^TResult1) ->
this.Bind(task, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in async cases
member inline this.MergeSources< ^TaskLike1, ^TResult1, ^TResult2, ^Awaiter1
when ^TaskLike1: (member GetAwaiter: unit -> ^Awaiter1)
and ^Awaiter1 :> ICriticalNotifyCompletion
and ^Awaiter1: (member get_IsCompleted: unit -> bool)
and ^Awaiter1: (member GetResult: unit -> 'TResult1)>
(task: ^TaskLike1, computation: Async< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task,
fun (result1: ^TResult1) ->
this.Bind(computation, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

type BackgroundTaskBuilder with
// This overload is required for type inference in async cases
member inline this.MergeSources< ^TaskLike2, ^TResult1, ^TResult2, ^Awaiter2
when ^TaskLike2: (member GetAwaiter: unit -> ^Awaiter2)
and ^Awaiter2 :> ICriticalNotifyCompletion
and ^Awaiter2: (member get_IsCompleted: unit -> bool)
and ^Awaiter2: (member GetResult: unit -> 'TResult2)>
(computation: Async< ^TResult1 >, task: ^TaskLike2)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
computation,
fun (result1: ^TResult1) ->
this.Bind(task, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)

// This overload is required for type inference in async cases
member inline this.MergeSources< ^TaskLike1, ^TResult1, ^TResult2, ^Awaiter1
when ^TaskLike1: (member GetAwaiter: unit -> ^Awaiter1)
and ^Awaiter1 :> ICriticalNotifyCompletion
and ^Awaiter1: (member get_IsCompleted: unit -> bool)
and ^Awaiter1: (member GetResult: unit -> 'TResult1)>
(task: ^TaskLike1, computation: Async< ^TResult2 >)
: Task<struct (^TResult1 * ^TResult2)> =
this.Run(
this.Bind(
task,
fun (result1: ^TResult1) ->
this.Bind(computation, fun (result2: ^TResult2) -> this.Return struct (result1, result2))
)
)
Loading