swift-mutex

Author: swhitty

Sources/Mutex.swift

@@ -30,7 +30,12 @@
 //
 
 // Backports the Swift 6 type Mutex<Value> to all Darwin platforms
-// @available(SwiftStdlib 6.0, deprecated, message: "Use Synchronization.Mutex included with Swift 6")
+
+// @available(macOS, deprecated: 15.0, message: "use Mutex from Synchronization module included with Swift 6")
+// @available(iOS, deprecated: 18.0, message: "use Mutex from Synchronization module included with Swift 6")
+// @available(tvOS, deprecated: 18.0, message: "use Mutex from Synchronization module included with Swift 6")
+// @available(watchOS, deprecated: 11.0, message: "use Mutex from Synchronization module included with Swift 6")
+// @available(visionOS, deprecated: 2.0, message: "use Mutex from Synchronization module included with Swift 6")
 public struct Mutex<Value>: @unchecked Sendable {
     let lock: AllocatedLock<Value> // Compatible with OSAllocatedUnfairLock iOS 16+
 }
@@ -73,6 +78,13 @@ public extension Mutex {
         }
     }
 }
+private struct Transferring<T> {
+    nonisolated(unsafe) var value: T
+
+    init(_ value: T) {
+        self.value = value
+    }
+}
 #else
 public extension Mutex {
     init(_ initialValue: consuming Value) {
@@ -96,14 +108,3 @@ public extension Mutex {
     }
 }
 #endif
-
-
-#if compiler(>=6)
-struct Transferring<T> {
-    nonisolated(unsafe) var value: T
-
-    init(_ value: T) {
-        self.value = value
-    }
-}
-#endif

Tests/MutexTests.swift

@@ -49,18 +49,18 @@ final class MutexTests: XCTestCase {
         }
     }
 
-    func testLockIfAvailable_ReturnsValue() {
-        let mutex = Mutex("fish")
-        mutex.lock.unsafeLock()
-        XCTAssertNil(
-            mutex.withLockIfAvailable { _ in "chips" }
-        )
-        mutex.lock.unsafeUnlock()
-        XCTAssertEqual(
-            mutex.withLockIfAvailable { _ in "chips" },
-            "chips"
-        )
-    }
+//    func testLockIfAvailable_ReturnsValue() {
+//        let mutex = Mutex("fish")
+//        mutex.lock.unsafeLock()
+//        XCTAssertNil(
+//            mutex.withLockIfAvailable { _ in "chips" }
+//        )
+//        mutex.lock.unsafeUnlock()
+//        XCTAssertEqual(
+//            mutex.withLockIfAvailable { _ in "chips" },
+//            "chips"
+//        )
+//    }
 
     func testWithLockIfAvailable_ThrowsError() {
         let mutex = Mutex("fish")

docker-run-tests.sh

@@ -4,6 +4,6 @@ set -eu
 
 docker run -it \
   --rm \
-  --mount src="$(pwd)",target=/allocatedlock,type=bind \
+  --mount src="$(pwd)",target=/mutex,type=bind \
   swiftlang/swift:nightly-6.0-jammy \
-  /usr/bin/swift test --package-path /allocatedlock
+  /usr/bin/swift test --package-path /mutex