adjust KyoException

getkyo · Dec 17, 2024 · 79cdc47 · 79cdc47
1 parent 91ed5bd
commit 79cdc47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/kyo-reactive-streams/shared/src/main/scala/kyo/interop/flow/StreamPublisher.scala b/kyo-reactive-streams/shared/src/main/scala/kyo/interop/flow/StreamPublisher.scala
@@ -33,8 +33,6 @@ object StreamPublisher:
         Tag[Emit[Chunk[V]]],
         Tag[Poll[Chunk[V]]]
     ): StreamPublisher[V, Ctx] < (Resource & IO & Ctx) =
-        inline def interruptPanic = Result.Panic(Fiber.Interrupted(scala.compiletime.summonInline[Frame]))
-
         def discardSubscriber(subscriber: Subscriber[? >: V]): Unit =
             subscriber.onSubscribe(new Subscription:
                 override def request(n: Long): Unit = ()
@@ -52,7 +50,7 @@ object StreamPublisher:
                     for
                         subscription <- IO.Unsafe(new StreamSubscription[V, Ctx](stream, subscriber))
                         fiber        <- subscription.subscribe.andThen(subscription.consume)
-                        _            <- supervisor.onInterrupt(_ => fiber.interrupt(interruptPanic).unit)
+                        _            <- supervisor.onInterrupt(_ => fiber.interrupt(Result.Panic(Interrupt())).unit)
                     yield ()
             )
 

diff --git a/kyo-reactive-streams/shared/src/test/scala/kyo/interop/Test.scala b/kyo-reactive-streams/shared/src/test/scala/kyo/interop/Test.scala
@@ -16,9 +16,12 @@ abstract class Test extends AsyncFreeSpec with BaseKyoTest[Async & Resource] wit
 
     def run(v: Future[Assertion] < (Async & Resource)): Future[Assertion] =
         import AllowUnsafe.embrace.danger
-        val a = Async.run(Resource.run(v))
-        val b = a.map(_.toFuture).map(_.flatten)
-        IO.Unsafe.evalOrThrow(b)
+        v.pipe(
+            Resource.run,
+            Async.run,
+            _.map(_.toFuture).map(_.flatten),
+            IO.Unsafe.evalOrThrow
+        )
     end run
 
     type Assertion = org.scalatest.compatible.Assertion