From 5f7403722150ca821d5e35fec0d9fa1d008f4e23 Mon Sep 17 00:00:00 2001
From: Tadeas Kriz <tadeas@touchlab.co>
Date: Fri, 17 May 2024 15:45:42 -0400
Subject: [PATCH] Add forgotten explicit modules to Combine conversion code.

---
 SKIE/acceptance-tests                                     | 2 +-
 .../skie/phases/runtime/FlowCombineConversionGenerator.kt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
index a8167ca6..0920c96c 160000
--- a/SKIE/acceptance-tests
+++ b/SKIE/acceptance-tests
@@ -1 +1 @@
-Subproject commit a8167ca67b286c631dc97fb23faadd1ad0886014
+Subproject commit 0920c96ca075f3817a5acd073de83a5d741194dd
diff --git a/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/runtime/FlowCombineConversionGenerator.kt b/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/runtime/FlowCombineConversionGenerator.kt
index 8cf18948..c04aefeb 100644
--- a/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/runtime/FlowCombineConversionGenerator.kt
+++ b/SKIE/kotlin-compiler/core/src/commonMain/kotlin/co/touchlab/skie/phases/runtime/FlowCombineConversionGenerator.kt
@@ -27,8 +27,8 @@ object FlowCombineConversionGenerator {
 
                 internal final actor SkieCombineSubscription<F: SkieSwiftFlowProtocol<S.Input>, S: Combine.Subscriber>: Combine.Subscription where S.Failure == _Concurrency.CancellationError {
                     private var currentDemand: Combine.Subscribers.Demand = .none
-                    private var onDemandUpdated: _Concurrency.CheckedContinuation<Void, Never>? = nil
-                    private var collectingTask: _Concurrency.Task<Void, Never>?
+                    private var onDemandUpdated: _Concurrency.CheckedContinuation<Swift.Void, Swift.Never>? = nil
+                    private var collectingTask: _Concurrency.Task<Swift.Void, Swift.Never>?
 
                     init(flow: F, subscriber: S) {
                         _Concurrency.Task {
@@ -55,7 +55,7 @@ object FlowCombineConversionGenerator {
 
                                 // If we get cancelled, tell subscriber we failed with CancellationError
                                 guard !_Concurrency.Task.isCancelled else {
-                                    subscriber.receive(completion: .failure(CancellationError()))
+                                    subscriber.receive(completion: .failure(_Concurrency.CancellationError()))
                                     return
                                 }
 
@@ -71,7 +71,7 @@ object FlowCombineConversionGenerator {
 
                                 // If we get cancelled, tell subscriber we failed with CancellationError
                                 guard !_Concurrency.Task.isCancelled else {
-                                    subscriber.receive(completion: .failure(CancellationError()))
+                                    subscriber.receive(completion: .failure(_Concurrency.CancellationError()))
                                     return
                                 }