Refactoring: remove open FsToolkit.ErrorHandling everywhere: we never used TaskResult in these files anyway

abelbraaksma · abelbraaksma · commit 4d58c8161ec2 · 2023-10-29T18:52:47.000+01:00
We want to remove the dependency in our tests on FsToolkit.ErrorHandling.TaskResult in PR #181 because it uses a high version of FSharp.Core. In other words, it disallows us to properly test TaskSeq with the lowest-denominator FSharp.Core it was compiled with, which we should do, to ensure stability in the widest range of forward-and-backward compatibility. The SmokeTests library, on the other hand, uses the highest RTM release of FSharp.Core and we don't really care about other deps there.
diff --git a/src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs b/src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs
@@ -2,11 +2,11 @@ namespace TaskSeq.Tests
 
 open System
 open System.Threading.Tasks
+
 open FsUnit
 open NHamcrest.Core
 open Microsoft.FSharp.Reflection
 
-open FsToolkit.ErrorHandling
 open Xunit
 open Xunit.Sdk
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Append.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Append.Tests.fs
@@ -1,13 +1,9 @@
 module TaskSeq.Tests.Append
 
-open System
-
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
-open System.Collections.Generic
 
 //
 // TaskSeq.append
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.AsyncExtensions.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.AsyncExtensions.Tests.fs
@@ -1,6 +1,5 @@
 module TaskSeq.Tests.AsyncExtensions
 
-open System
 open Xunit
 open FsUnit.Xunit
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Cast.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Cast.Tests.fs
@@ -4,7 +4,6 @@ open System
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Choose.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Choose.Tests.fs
@@ -1,11 +1,9 @@
 module TaskSeq.Tests.Choose
 
 open System
-open System.Threading.Tasks
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Collect.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Collect.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.Collect
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Concat.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Concat.Tests.fs
@@ -1,13 +1,11 @@
 module TaskSeq.Tests.Concat
 
-open System
+open System.Collections.Generic
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
-open System.Collections.Generic
 
 //
 // TaskSeq.concat
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Contains.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Contains.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.Contains
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Delay.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Delay.Tests.fs
@@ -1,13 +1,9 @@
 module TaskSeq.Tests.Delay
 
-open System
-
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
-open System.Collections.Generic
 
 //
 // TaskSeq.delay
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Do.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Do.Tests.fs
@@ -1,7 +1,7 @@
 module TaskSeq.Tests.Do
 
-open System
 open System.Threading.Tasks
+
 open FsUnit
 open Xunit
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Empty.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Empty.Tests.fs
@@ -3,7 +3,6 @@ module TaskSeq.Tests.Empty
 open System.Threading.Tasks
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
@@ -42,7 +41,7 @@ let ``TaskSeq-empty of unit in a taskSeq context`` () = task {
 [<Fact>]
 let ``TaskSeq-empty of more complex type in a taskSeq context`` () = task {
     let! sq =
-        taskSeq { yield! TaskSeq.empty<Result<Task<string>, int>> }
+        taskSeq { yield! TaskSeq.empty<Result<Task<string>, int>> } // not a TaskResult, but a ResultTask lol
         |> TaskSeq.toArrayAsync
 
     Array.isEmpty sq |> should be True
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.ExactlyOne.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.ExactlyOne.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.ExactlyOne
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Except.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Except.Tests.fs
@@ -1,9 +1,7 @@
 module TaskSeq.Tests.Except
 
-open System
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Exists.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Exists.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.Exists
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Filter.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Filter.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.Filter
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Find.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Find.Tests.fs
@@ -1,11 +1,11 @@
 module TaskSeq.Tests.Find
 
+open System.Collections.Generic
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
-open System.Collections.Generic
 
 //
 // TaskSeq.find
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.FindIndex.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.FindIndex.Tests.fs
@@ -1,11 +1,11 @@
 module TaskSeq.Tests.FindIndex
 
+open System.Collections.Generic
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
-open System.Collections.Generic
 
 //
 // TaskSeq.findIndex
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Fold.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Fold.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.Fold
 
 open System.Text
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Head.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Head.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.Head
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Indexed.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Indexed.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.Indexed
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Init.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Init.Tests.fs
@@ -4,7 +4,6 @@ open System
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.IsEmpty.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.IsEmpty.fs
@@ -1,9 +1,7 @@
 module TaskSeq.Tests.IsEmpty
 
-open System.Threading.Tasks
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Item.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Item.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.Item
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Last.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Last.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.Last
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Length.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Length.Tests.fs
@@ -1,9 +1,7 @@
 module TaskSeq.Tests.Length
 
-open System
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Let.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Let.Tests.fs
@@ -2,6 +2,7 @@ module TaskSeq.Tests.Let
 
 open System
 open System.Threading.Tasks
+
 open FsUnit
 open Xunit
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Map.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Map.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.Map
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.OfXXX.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.OfXXX.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.``Conversion-From``
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Pick.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Pick.Tests.fs
@@ -1,10 +1,9 @@
 module TaskSeq.Tests.Pick
 
-open System
 open System.Collections.Generic
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Realworld.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Realworld.fs
@@ -2,14 +2,13 @@ namespace TaskSeq.Tests
 
 open System
 open System.IO
+open System.Threading.Tasks
+open System.Collections.Generic
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
-open System.Threading.Tasks
-open System.Diagnostics
-open System.Collections.Generic
 open Xunit.Abstractions
 
 /// Just a naive, simple in-memory reader that acts as an IAsyncEnumerable to use with tests
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Singleton.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Singleton.Tests.fs
@@ -2,7 +2,6 @@ module TaskSeq.Tests.Singleton
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.StateTransitionBug-delayed.Tests.CE.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.StateTransitionBug-delayed.Tests.CE.fs
@@ -1,13 +1,9 @@
 module TaskSeq.Tests.``Bug #42 -- asynchronous`` // see PR #42
 
 open System
-open System.Threading.Tasks
-open System.Diagnostics
-open System.Collections.Generic
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.StateTransitionBug.Tests.CE.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.StateTransitionBug.Tests.CE.fs
@@ -2,12 +2,10 @@ module TaskSeq.Tests.``Bug #42 -- synchronous`` // see PR #42
 
 open System
 open System.Threading.Tasks
-open System.Diagnostics
 open System.Collections.Generic
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Tail.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Tail.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.Tail
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.TakeWhile.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.TakeWhile.Tests.fs
@@ -1,9 +1,9 @@
 module TaskSeq.Tests.TakeWhile
 
 open System
+
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.TaskExtensions.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.TaskExtensions.Tests.fs
@@ -1,6 +1,5 @@
 module TaskSeq.Tests.TaskExtensions
 
-open System
 open Xunit
 open FsUnit.Xunit
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Tests.CE.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Tests.CE.fs
@@ -4,7 +4,6 @@ open System
 
 open Xunit
 open FsUnit.Xunit
-open FsToolkit.ErrorHandling
 
 open FSharp.Control
 
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.ToXXX.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.ToXXX.Tests.fs
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Using.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Using.Tests.fs
diff --git a/src/FSharp.Control.TaskSeq.Test/TaskSeq.Zip.Tests.fs b/src/FSharp.Control.TaskSeq.Test/TaskSeq.Zip.Tests.fs
diff --git a/src/FSharp.Control.TaskSeq.Test/TestUtils.fs b/src/FSharp.Control.TaskSeq.Test/TestUtils.fs
