swift 6

Author: swhitty

Sources/IdentifiableContinuation.swift

@@ -37,7 +37,6 @@ typealias Mutex = Synchronization.Mutex
 
 #endif
 
-#if compiler(>=6.0)
 /// Invokes the passed in closure with an `IdentifableContinuation` for the current task.
 ///
 /// The body of the closure executes synchronously on the calling actor. Once it returns the calling task is suspended.
@@ -61,7 +60,9 @@ public func withIdentifiableContinuation<T>(
 ) async -> T {
     let id = IdentifiableContinuation<T, Never>.ID()
     let state = Mutex((isStarted: false, isCancelled: false))
+    #if compiler(<6.2)
     nonisolated(unsafe) let body = body
+    #endif
     return await withTaskCancellationHandler {
         await withCheckedContinuation(isolation: isolation, function: function) {
             let continuation = IdentifiableContinuation(id: id, continuation: $0)
@@ -108,7 +109,9 @@ public func withIdentifiableThrowingContinuation<T>(
 ) async throws -> T {
     let id = IdentifiableContinuation<T, any Error>.ID()
     let state = Mutex((isStarted: false, isCancelled: false))
+    #if compiler(<6.2)
     nonisolated(unsafe) let body = body
+    #endif
     return try await withTaskCancellationHandler {
         try await withCheckedThrowingContinuation(isolation: isolation, function: function) {
             let continuation = IdentifiableContinuation(id: id, continuation: $0)
@@ -131,111 +134,13 @@ public func withIdentifiableThrowingContinuation<T>(
         }
     }
 }
-#else
-/// Invokes the passed in closure with an `IdentifableContinuation` for the current task.
-///
-/// The body of the closure executes synchronously on the calling actor. Once it returns the calling task is suspended.
-/// It is possible to immediately resume the task, or escape the continuation in order to complete it afterwards, which
-/// will then resume the suspended task.
-///
-/// You must invoke the continuation's `resume` method exactly once.
-/// - Parameters:
-///   - isolation: Actor isolation used when executing the body closure.
-///   - function: A string identifying the declaration that is the notional
-///     source for the continuation, used to identify the continuation in
-///     runtime diagnostics related to misuse of this continuation.
-///   - body: A closure that takes a `IdentifiableContinuation` parameter.
-///   - handler: Cancellation closure executed when the current Task is cancelled.  Handler is always called _after_ the body closure is compeled.
-/// - Returns: The value continuation is resumed with.
-@_unsafeInheritExecutor
-public func withIdentifiableContinuation<T>(
-  isolation: isolated some Actor,
-  function: String = #function,
-  body: (IdentifiableContinuation<T, Never>) -> Void,
-  onCancel handler: @Sendable (IdentifiableContinuation<T, Never>.ID) -> Void
-) async -> T {
-    let id = IdentifiableContinuation<T, Never>.ID()
-    let state = Mutex((isStarted: false, isCancelled: false))
-    return await withTaskCancellationHandler {
-        await withCheckedContinuation(function: function) {
-            let continuation = IdentifiableContinuation(id: id, continuation: $0)
-            body(continuation)
-            let sendCancel = state.withLock {
-                $0.isStarted = true
-                return $0.isCancelled
-            }
-            if sendCancel {
-                handler(id)
-            }
-            _ = isolation
-        }
-    } onCancel: {
-        let sendCancel = state.withLock {
-            $0.isCancelled = true
-            return $0.isStarted
-        }
-        if sendCancel {
-            handler(id)
-        }
-    }
-}
-
-/// Invokes the passed in closure with an `IdentifableContinuation` for the current task.
-///
-/// The body of the closure executes synchronously on the calling actor. Once it returns the calling task is suspended.
-/// It is possible to immediately resume the task, or escape the continuation in order to complete it afterwards, which
-/// will then resume the suspended task.
-///
-/// You must invoke the continuation's `resume` method exactly once.
-/// - Parameters:
-///   - isolation: Actor isolation used when executing the body closure.
-///   - function: A string identifying the declaration that is the notional
-///     source for the continuation, used to identify the continuation in
-///     runtime diagnostics related to misuse of this continuation.
-///   - body: A closure that takes a `IdentifiableContinuation` parameter.
-///   - handler: Cancellation closure executed when the current Task is cancelled.  Handler is always called _after_ the body closure is compeled.
-/// - Returns: The value continuation is resumed with.
-@_unsafeInheritExecutor
-public func withIdentifiableThrowingContinuation<T>(
-  isolation: isolated some Actor,
-  function: String = #function,
-  body: (IdentifiableContinuation<T, any Error>) -> Void,
-  onCancel handler: @Sendable (IdentifiableContinuation<T, any Error>.ID) -> Void
-) async throws -> T {
-    let id = IdentifiableContinuation<T, any Error>.ID()
-    let state = Mutex((isStarted: false, isCancelled: false))
-    return try await withTaskCancellationHandler {
-        try await withCheckedThrowingContinuation(function: function) {
-            let continuation = IdentifiableContinuation(id: id, continuation: $0)
-            body(continuation)
-            let sendCancel = state.withLock {
-                $0.isStarted = true
-                return $0.isCancelled
-            }
-            if sendCancel {
-                handler(id)
-            }
-            _ = isolation
-        }
-    } onCancel: {
-        let sendCancel = state.withLock {
-            $0.isCancelled = true
-            return $0.isStarted
-        }
-        if sendCancel {
-            handler(id)
-        }
-    }
-}
-#endif
 
 public struct IdentifiableContinuation<T, E>: Sendable, Identifiable where E: Error {
 
     public let id: ID
 
     public final class ID: Hashable, Sendable {
 
-        @usableFromInline
         init() { }
 
         public func hash(into hasher: inout Hasher) {
@@ -247,31 +152,20 @@ public struct IdentifiableContinuation<T, E>: Sendable, Identifiable where E: Er
         }
     }
 
-    @usableFromInline
     init(id: ID, continuation: CheckedContinuation<T, E>) {
         self.id = id
         self.continuation = continuation
     }
 
     private let continuation: CheckedContinuation<T, E>
 
-#if compiler(>=6.0)
     public func resume(returning value: sending T) {
         continuation.resume(returning: value)
     }
 
     public func resume(with result: sending Result<T, E>) {
         continuation.resume(with: result)
     }
-#else
-    public func resume(returning value: T) {
-        continuation.resume(returning: value)
-    }
-
-    public func resume(with result: Result<T, E>) {
-        continuation.resume(with: result)
-    }
-#endif
 
     public func resume(throwing error: E) {
         continuation.resume(throwing: error)

Sources/Mutex+Darwin.swift

@@ -38,16 +38,13 @@ import func os.os_unfair_lock_unlock
 import func os.os_unfair_lock_trylock
 
 // Backports the Swift 6 type Mutex<Value> to all Darwin platforms
-@usableFromInline
 struct Mutex<Value: ~Copyable>: ~Copyable {
     let storage: Storage<Value>
 
-    @usableFromInline
     init(_ initialValue: consuming sending Value) {
         self.storage = Storage(initialValue)
     }
 
-    @usableFromInline
     borrowing func withLock<Result, E: Error>(
         _ body: (inout sending Value) throws(E) -> sending Result
     ) throws(E) -> sending Result {
@@ -56,7 +53,6 @@ struct Mutex<Value: ~Copyable>: ~Copyable {
         return try body(&storage.value)
     }
 
-    @usableFromInline
     borrowing func withLockIfAvailable<Result, E: Error>(
         _ body: (inout sending Value) throws(E) -> sending Result
     ) throws(E) -> sending Result? {