done compatible with Sendable (#1159)

Co-authored-by: Rachel Brindle <you@subluminal.net>
Quick · Dec 12, 2024 · fd4a97e · fd4a97e
1 parent 9aaef11
commit fd4a97e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Sources/Nimble/DSL+AsyncAwait.swift b/Sources/Nimble/DSL+AsyncAwait.swift
@@ -93,7 +93,7 @@ public func waitUntil(
     file: FileString = #filePath,
     line: UInt = #line,
     column: UInt = #column,
-    action: @escaping (@escaping () -> Void) async -> Void
+    action: @escaping (@escaping @Sendable () -> Void) async -> Void
 ) async {
     await throwableUntil(
         timeout: timeout,
@@ -116,7 +116,7 @@ public func waitUntil(
     file: FileString = #filePath,
     line: UInt = #line,
     column: UInt = #column,
-    action: @escaping (@escaping () -> Void) -> Void
+    action: @escaping (@escaping @Sendable () -> Void) -> Void
 ) async {
     await throwableUntil(
         timeout: timeout,
@@ -134,7 +134,7 @@ private enum ErrorResult {
 private func throwableUntil(
     timeout: NimbleTimeInterval,
     sourceLocation: SourceLocation,
-    action: @escaping (@escaping () -> Void) async throws -> Void) async {
+    action: @escaping (@escaping @Sendable () -> Void) async throws -> Void) async {
         let leeway = timeout.divided
         let result = await performBlock(
             timeoutInterval: timeout,

diff --git a/Tests/NimbleTests/AsyncAwaitTest.swift b/Tests/NimbleTests/AsyncAwaitTest.swift
@@ -189,6 +189,15 @@ final class AsyncAwaitTest: XCTestCase { // swiftlint:disable:this type_body_len
         }
     }
 
+    func testWaitUntilUsingSendable() async {
+        await waitUntil { done in
+            let queue = OperationQueue()
+            let op = BlockOperation {}
+            op.completionBlock = done
+            queue.addOperation(op)
+        }
+    }
+
     func testWaitUntilTimesOutIfNotCalled() async {
         await failsWithErrorMessage("Waited more than 1.0 second") {
             await waitUntil(timeout: .seconds(1)) { _ in return }