Cancellation tests

Author: natsukagami

jvm/src/test/scala/CancellationBehavior.scala

@@ -1,3 +1,5 @@
+import language.experimental.captureChecking
+
 import gears.async.AsyncOperations.*
 import gears.async.default.given
 import gears.async.{Async, AsyncSupport, Future, uninterruptible}

shared/src/main/scala/async/listeners/locking.scala

@@ -27,14 +27,14 @@ case class ConflictingLocksException(
 def lockBoth[T, U](
     lt: Listener[T]^,
     lu: Listener[U]^
-): (lt.type | lu.type | true)^{lt, lu} =
+): (lt.type | lu.type | true) =
   val lockT = if lt.lock == null then return (if lu.acquireLock() then true else lu) else lt.lock
   val lockU = if lu.lock == null then return (if lt.acquireLock() then true else lt) else lu.lock
 
   def doLock[T, U](lt: Listener[T]^, lu: Listener[U]^)(
       lockT: ListenerLock^{lt},
       lockU: ListenerLock^{lu}
-  ): (lt.type | lu.type | true)^{lt, lu} =
+  ): (lt.type | lu.type | true) =
     // assert(lockT.number > lockU.number)
     if !lockT.acquire() then lt
     else if !lockU.acquire() then

shared/src/test/scala/CancellationBehavior.scala

@@ -1,3 +1,5 @@
+import language.experimental.captureChecking
+
 import gears.async.AsyncOperations.*
 import gears.async.default.given
 import gears.async.{Async, AsyncSupport, Future, uninterruptible}
@@ -12,9 +14,9 @@ import boundary.break
 class CancellationBehavior extends munit.FunSuite:
   enum State:
     case Ready
-    case Initialized(f: Future[?])
+    case Initialized
     case RunningEarly
-    case Running(f: Future[?])
+    case Running
     case Failed(t: Throwable)
     case Cancelled
     case Completed
@@ -27,19 +29,21 @@ class CancellationBehavior extends munit.FunSuite:
         state match
           case State.Ready =>
             state = State.RunningEarly
-          case State.Initialized(f) =>
-            state = State.Running(f)
+          case State.Initialized =>
+            state = State.Running
           case _ => fail(s"running failed, state is $state")
-    def initialize(f: Future[?]) =
+    def initialize(f: Future[?]^) =
       synchronized:
         state match
           case State.Ready =>
-            state = State.Initialized(f)
+            state = State.Initialized
           case State.RunningEarly =>
-            state = State.Running(f)
+            state = State.Running
           case _ => fail(s"initializing failed, state is $state")
 
-  private def startFuture(info: Info, body: Async ?=> Unit = {})(using a: Async, s: Async.Spawn & a.type) =
+  private def startFuture(info: Info, body: Async ?=> Unit = {})(using a: Async, s: Async.Spawn)(using
+      a.type =:= s.type
+  ) =
     val f = Future:
       info.run()
       try
@@ -67,7 +71,7 @@ class CancellationBehavior extends munit.FunSuite:
   test("group cancel"):
     var x = 0
     Async.blocking:
-      Async.group:
+      Async.group[Unit]:
         Future:
           sleep(400)
           x = 1