Update package versions and add BenchmarkDotNet reference; refactor awaiter handling in CancellableTask modules

Author: TheAngryByrd

Directory.Packages.props

@@ -9,7 +9,7 @@
     <PackageVersion Include="Hopac" Version="0.5.1" />
     <PackageVersion Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
     <PackageVersion Include="Fable.Core" Version="4.2.0" />
-    <PackageVersion Include="IcedTasks" Version="0.11.7" />
+    <PackageVersion Include="IcedTasks" Version="0.11.8" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
 

benchmarks/SeqTests.fs

@@ -6,6 +6,7 @@ open BenchmarkDotNet.Mathematics
 open BenchmarkDotNet.Configs
 open System.Threading
 open System
+open FsToolkit.ErrorHandling
 
 module sequenceResultMTests =
 

benchmarks/benchmarks.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup>
@@ -27,5 +27,8 @@
     <ProjectReference
       Include="..\src\FsToolkit.ErrorHandling.JobResult\FsToolkit.ErrorHandling.JobResult.fsproj" />
   </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
+
+    <ItemGroup>
+      <PackageReference Include="BenchmarkDotnet"/>
+    </ItemGroup>
 </Project>

src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultBuilderBase.fs

@@ -1057,9 +1057,9 @@ module CancellableTaskResultBuilderBase =
             ///
             member inline _.Using
                 (
-                    resource: #IDisposable,
+                    resource: #IDisposableNull,
                     binder:
-                        #IDisposable
+                        #IDisposableNull
                             -> CancellableTaskResultBuilderBaseCode<'TOverall, 'T, 'Error, 'Builder>
                 ) =
                 ResumableCode.Using(resource, binder)

src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskResultCE.fs

@@ -53,16 +53,16 @@ module CancellableTaskResultCE =
                             if step then
                                 MethodBuilder.SetResult(&sm.Data.MethodBuilder, sm.Data.Result)
                             else
-                                let mutable awaiter =
-                                    sm.ResumptionDynamicInfo.ResumptionData
-                                    :?> ICriticalNotifyCompletion
-
-                                MethodBuilder.AwaitUnsafeOnCompleted(
-                                    &sm.Data.MethodBuilder,
-                                    &awaiter,
-                                    &sm
-                                )
-
+                                match sm.ResumptionDynamicInfo.ResumptionData with
+                                | :? ICriticalNotifyCompletion as awaiter ->
+                                    let mutable awaiter = awaiter
+
+                                    MethodBuilder.AwaitUnsafeOnCompleted(
+                                        &sm.Data.MethodBuilder,
+                                        &awaiter,
+                                        &sm
+                                    )
+                                | awaiter -> assert not (isNull awaiter)
                         with exn ->
                             savedExn <- exn
                         // Run SetException outside the stack unwind, see https://github.com/dotnet/roslyn/issues/26567

src/FsToolkit.ErrorHandling.IcedTasks/CancellableTaskValidationCE.fs

@@ -107,15 +107,16 @@ module CancellableTaskValidationCE =
                                 // sm.Data.MethodBuilder.SetResult sm.Data.Result
                                 MethodBuilder.SetResult(&sm.Data.MethodBuilder, sm.Data.Result)
                             else
-                                let mutable awaiter =
-                                    sm.ResumptionDynamicInfo.ResumptionData
-                                    :?> ICriticalNotifyCompletion
-
-                                MethodBuilder.AwaitUnsafeOnCompleted(
-                                    &sm.Data.MethodBuilder,
-                                    &awaiter,
-                                    &sm
-                                )
+                                match sm.ResumptionDynamicInfo.ResumptionData with
+                                | :? ICriticalNotifyCompletion as awaiter ->
+                                    let mutable awaiter = awaiter
+
+                                    MethodBuilder.AwaitUnsafeOnCompleted(
+                                        &sm.Data.MethodBuilder,
+                                        &awaiter,
+                                        &sm
+                                    )
+                                | awaiter -> assert not (isNull awaiter)
 
                         with exn ->
                             savedExn <- exn