Merge branch 'main' into repo-assist/perf-windowed-toarray-20260317-b24afc7df3f6922d

Author: dsyme

release-notes.txt

@@ -4,6 +4,7 @@ Release notes:
 1.0.0
     - perf: optimize TaskSeq.windowed to avoid integer modulo in hot loop, using explicit circular buffer pointer arithmetic
     - perf: optimize toResizeArrayAsync (internal) to use a direct loop instead of routing through iter, eliminating one closure allocation per call
+    - refactor: simplify lengthBy and lengthBeforeMax to use while! and remove the redundant mutable 'go' and initial MoveNextAsync
     - adds TaskSeq.distinctUntilChangedWith and TaskSeq.distinctUntilChangedWithAsync, #345
     - adds TaskSeq.withCancellation, #167
     - adds TaskSeq.replicateInfinite, replicateInfiniteAsync, replicateUntilNoneAsync, #345

src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
   </PropertyGroup>
 

src/FSharp.Control.TaskSeq.Test/TaskSeq.Length.Tests.fs

@@ -300,8 +300,7 @@ module SideEffects =
 
     [<Theory; ClassData(typeof<TestSideEffectTaskSeq>)>]
     let ``TaskSeq-lengthOrMax returns max and stops evaluation when sequence exceeds max`` variant = task {
-        // source has 10 items; max=5 → should stop early
-        // NOTE: the implementation reads one element ahead (N+1 total MoveNextAsync calls for result N)
+        // source has 10 items; max=5 → should stop early after exactly 5 elements
         let mutable evaluated = 0
 
         let ts = taskSeq {
@@ -312,14 +311,12 @@ module SideEffects =
 
         let! len = ts |> TaskSeq.lengthOrMax 5
         len |> should equal 5
-        // exactly max+1 elements are pulled from the source due to read-ahead
-        evaluated |> should equal 6
+        // exactly max elements are pulled from the source
+        evaluated |> should equal 5
     }
 
     [<Fact>]
-    let ``TaskSeq-lengthOrMax stops evaluating source after reaching max - read-ahead characteristic`` () = task {
-        // NOTE: the implementation calls MoveNextAsync once before the while loop,
-        // then once more per iteration. For max=N and a longer source, this means N+1 calls total.
+    let ``TaskSeq-lengthOrMax stops evaluating source after reaching max`` () = task {
         let mutable sideEffects = 0
 
         let ts = taskSeq {
@@ -330,14 +327,12 @@ module SideEffects =
 
         let! len = ts |> TaskSeq.lengthOrMax 7
         len |> should equal 7
-        // max+1 elements are evaluated due to the read-ahead implementation pattern
-        sideEffects |> should equal 8
+        // exactly max elements are evaluated
+        sideEffects |> should equal 7
     }
 
     [<Fact>]
-    let ``TaskSeq-lengthOrMax with max=0 still evaluates the first element due to read-ahead`` () = task {
-        // The implementation unconditionally calls MoveNextAsync once before entering
-        // the while loop, so even max=0 evaluates the first element of the source.
+    let ``TaskSeq-lengthOrMax with max=0 evaluates zero elements`` () = task {
         let mutable sideEffects = 0
 
         let ts = taskSeq {
@@ -349,6 +344,6 @@ module SideEffects =
 
         let! len = ts |> TaskSeq.lengthOrMax 0
         len |> should equal 0
-        // one element was evaluated despite max=0
-        sideEffects |> should equal 1
+        // no elements evaluated when max=0
+        sideEffects |> should equal 0
     }

src/FSharp.Control.TaskSeq/TaskSeqInternal.fs

@@ -179,37 +179,25 @@ module internal TaskSeqInternal =
         checkNonNull (nameof source) source
 
         task {
-
             use e = source.GetAsyncEnumerator CancellationToken.None
-            let mutable go = true
             let mutable i = 0
-            let! step = e.MoveNextAsync()
-            go <- step
 
             match predicate with
             | None ->
-                while go do
-                    let! step = e.MoveNextAsync()
-                    i <- i + 1 // update before moving: we are counting, not indexing
-                    go <- step
+                while! e.MoveNextAsync() do
+                    i <- i + 1
 
             | Some(Predicate predicate) ->
-                while go do
+                while! e.MoveNextAsync() do
                     if predicate e.Current then
                         i <- i + 1
 
-                    let! step = e.MoveNextAsync()
-                    go <- step
-
             | Some(PredicateAsync predicate) ->
-                while go do
+                while! e.MoveNextAsync() do
                     match! predicate e.Current with
                     | true -> i <- i + 1
                     | false -> ()
 
-                    let! step = e.MoveNextAsync()
-                    go <- step
-
             return i
         }
 
@@ -219,15 +207,13 @@ module internal TaskSeqInternal =
 
         task {
             use e = source.GetAsyncEnumerator CancellationToken.None
-            let mutable go = true
             let mutable i = 0
-            let! step = e.MoveNextAsync()
-            go <- step
+            let mutable go = true
 
             while go && i < max do
-                i <- i + 1 // update before moving: we are counting, not indexing
-                let! step = e.MoveNextAsync()
-                go <- step
+                let! hasMore = e.MoveNextAsync()
+
+                if hasMore then i <- i + 1 else go <- false
 
             return i
         }