swift 6

Author: swhitty

.github/workflows/build.yml

@@ -55,33 +55,6 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  xcode_15_4:
-    runs-on: macos-14
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Version
-        run: swift --version
-      - name: Build
-        run: swift build --build-tests
-      - name: Test
-        run: swift test --skip-build
-
-  linux_swift_5_10:
-    runs-on: ubuntu-latest
-    container: swift:5.10
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Version
-        run: swift --version
-      - name: Build
-        run: swift build --build-tests
-      - name: Test
-        run: swift test --skip-build
-
   linux_swift_6_0:
     runs-on: ubuntu-latest
     container: swift:6.0.3
@@ -151,15 +124,15 @@ jobs:
       - name: Build
         run: swift build --swift-sdk aarch64-unknown-linux-android24
 
-  windows_swift_6_1:
+  windows_swift_6_2:
     runs-on: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Swift
         uses: SwiftyLab/setup-swift@latest
         with:
-          swift-version: "6.1.2"
+          swift-version: "6.2.0"
           visual-studio-components: Microsoft.VisualStudio.Component.Windows11SDK.22621
       - name: Version
         run: swift --version

[email protected]

@@ -29,10 +29,6 @@
 //  SOFTWARE.
 //
 
-#if compiler(>=6)
-
-#if !canImport(WinSDK)
-
 // Backports the Swift 6 type Mutex<Value> to all Darwin platforms
 @usableFromInline
 struct Mutex<Value: ~Copyable>: ~Copyable {
@@ -64,40 +60,6 @@ struct Mutex<Value: ~Copyable>: ~Copyable {
 
 extension Mutex: @unchecked Sendable where Value: ~Copyable { }
 
-#else
-
-// Windows doesn't support ~Copyable yet
-
-@usableFromInline
-struct Mutex<Value>: @unchecked Sendable {
-    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 {
-        storage.lock()
-        defer { storage.unlock() }
-        return try body(&storage.value)
-    }
-
-    @usableFromInline
-    borrowing func withLockIfAvailable<Result, E: Error>(
-        _ body: (inout sending Value) throws(E) -> sending Result
-    ) throws(E) -> sending Result? {
-        guard storage.tryLock() else { return nil }
-        defer { storage.unlock() }
-        return try body(&storage.value)
-    }
-}
-
-#endif
-
 #if canImport(Darwin)
 
 import struct os.os_unfair_lock_t
@@ -209,5 +171,3 @@ final class Storage<Value> {
 }
 
 #endif
-
-#endif