Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "6.3.0-alpha-004",
"version": "7.0.5",
"commands": [
"fantomas"
]
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ CI runs both debug and release test configurations on `windows-latest`. Test res

## Code Formatting

Formatting is enforced by **Fantomas** (version 6.3.0-alpha-004, configured as a dotnet local tool).
Formatting is enforced by **Fantomas** (version 7.0.5, configured as a dotnet local tool).

Check formatting (CI runs this on every PR):

Expand Down
6 changes: 1 addition & 5 deletions src/FSharp.Control.TaskSeq.SmokeTests/TestUtils.fs
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@ module Gen =
/// properly, sequentially execute a chain of tasks in a non-blocking, non-overlapping way.
let joinWithContinuation tasks =
let simple (t: unit -> Task<_>) (source: unit -> Task<_>) : unit -> Task<_> =
fun () ->
source()
.ContinueWith((fun (_: Task) -> t ()), TaskContinuationOptions.OnlyOnRanToCompletion)
.Unwrap()
:?> Task<_>
fun () -> source().ContinueWith((fun (_: Task) -> t ()), TaskContinuationOptions.OnlyOnRanToCompletion).Unwrap() :?> Task<_>

let rec combine acc (tasks: (unit -> Task<_>) list) =
match tasks with
Expand Down
6 changes: 1 addition & 5 deletions src/FSharp.Control.TaskSeq.Test/TestUtils.fs
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,7 @@ module TestUtils =
/// properly, sequentially execute a chain of tasks in a non-blocking, non-overlapping way.
let joinWithContinuation tasks =
let simple (t: unit -> Task<_>) (source: unit -> Task<_>) : unit -> Task<_> =
fun () ->
source()
.ContinueWith((fun (_: Task) -> t ()), TaskContinuationOptions.OnlyOnRanToCompletion)
.Unwrap()
:?> Task<_>
fun () -> source().ContinueWith((fun (_: Task) -> t ()), TaskContinuationOptions.OnlyOnRanToCompletion).Unwrap() :?> Task<_>

let rec combine acc (tasks: (unit -> Task<_>) list) =
match tasks with
Expand Down
11 changes: 3 additions & 8 deletions src/FSharp.Control.TaskSeq/TaskSeqBuilder.fs
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,8 @@ module LowPriority =
and ^Awaiter :> ICriticalNotifyCompletion
and ^Awaiter: (member get_IsCompleted: unit -> bool)
and ^Awaiter: (member GetResult: unit -> 'T)>
(
task: ^TaskLike,
continuation: ('T -> ResumableTSC<'U>)
) =
(task: ^TaskLike, continuation: ('T -> ResumableTSC<'U>))
=

ResumableTSC<'U>(fun sm ->
let mutable awaiter = (^TaskLike: (member GetAwaiter: unit -> ^Awaiter) (task))
Expand Down Expand Up @@ -656,10 +654,7 @@ module HighPriority =

member inline _.Bind(computation: Async<'T>, continuation: ('T -> ResumableTSC<'U>)) =
ResumableTSC<'U>(fun sm ->
let mutable awaiter =
Async
.StartImmediateAsTask(computation, cancellationToken = sm.Data.cancellationToken)
.GetAwaiter()
let mutable awaiter = Async.StartImmediateAsTask(computation, cancellationToken = sm.Data.cancellationToken).GetAwaiter()

let mutable __stack_fin = true

Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Control.TaskSeq/TaskSeqInternal.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ module internal TaskSeqInternal =
taskSeq {
use e = source.GetAsyncEnumerator CancellationToken.None

for _ in count .. - 1 .. 1 do
for _ in count .. -1 .. 1 do
let! step = e.MoveNextAsync()

if not step then
Expand Down
Loading