Merge branch 'main' into do-not-fail-on-timeout-when-continuous

Author: younata

Gemfile.lock

@@ -102,7 +102,7 @@ GEM
     open4 (1.3.4)
     public_suffix (4.0.7)
     redcarpet (3.6.0)
-    rexml (3.3.9)
+    rexml (3.4.2)
     rouge (4.4.0)
     ruby-macho (2.5.1)
     sassc (2.4.0)

Sources/Nimble/DSL+Require.swift

@@ -294,7 +294,7 @@ public func unwrapa<T>(fileID: String = #fileID, file: FileString = #filePath, l
 ///
 /// - Parameter message: A custom message to use in place of the default one.
 /// - Parameter customError: A custom error to throw in place of a ``RequireError``.
-public func requireFail(_ message: String? = nil, customError: Error? = nil, fileID: String = #fileID, filePath: FileString = #filePath, line: UInt = #line, column: UInt = #column) throws {
+public func requireFail(_ message: String? = nil, customError: Error? = nil, fileID: String = #fileID, filePath: FileString = #filePath, line: UInt = #line, column: UInt = #column) throws -> Never {
     let location = SourceLocation(fileID: fileID, filePath: filePath, line: line, column: column)
     let handler = NimbleEnvironment.activeInstance.assertionHandler
 

Sources/Nimble/Utils/AsyncAwait.swift

@@ -1,9 +1,5 @@
 #if !os(WASI)
 
-#if canImport(CoreFoundation)
-import CoreFoundation
-#endif
-
 import Dispatch
 import Foundation
 

Sources/Nimble/Utils/AsyncTimerSequence.swift

@@ -1,8 +1,5 @@
 #if !os(WASI)
 
-#if canImport(CoreFoundation)
-import CoreFoundation
-#endif
 import Dispatch
 import Foundation
 

Sources/Nimble/Utils/PollAwait.swift

@@ -1,8 +1,5 @@
 #if !os(WASI)
 
-#if canImport(CoreFoundation)
-import CoreFoundation
-#endif
 import Dispatch
 import Foundation
 
@@ -198,48 +195,24 @@ internal class AwaitPromiseBuilder<T> {
             let timedOutSem = DispatchSemaphore(value: 0)
             let semTimedOutOrBlocked = DispatchSemaphore(value: 0)
             semTimedOutOrBlocked.signal()
-            #if canImport(CoreFoundation)
-            let runLoop = CFRunLoopGetMain()
-            #if canImport(Darwin)
-                let runLoopMode = CFRunLoopMode.defaultMode.rawValue
-            #else
-                let runLoopMode = kCFRunLoopDefaultMode
-            #endif
-            CFRunLoopPerformBlock(runLoop, runLoopMode) {
-                if semTimedOutOrBlocked.wait(timeout: .now()) == .success {
-                    timedOutSem.signal()
-                    semTimedOutOrBlocked.signal()
-                    if self.promise.resolveResult(.timedOut) {
-                        CFRunLoopStop(CFRunLoopGetMain())
-                    }
-                }
-            }
-            // potentially interrupt blocking code on run loop to let timeout code run
-            CFRunLoopStop(runLoop)
-            #else
             let runLoop = RunLoop.main
             runLoop.perform(inModes: [.default], block: {
                 if semTimedOutOrBlocked.wait(timeout: .now()) == .success {
                     timedOutSem.signal()
                     semTimedOutOrBlocked.signal()
                     if self.promise.resolveResult(.timedOut) {
-                        RunLoop.main._stop()
+                        RunLoop.main.stop()
                     }
                 }
             })
             // potentially interrupt blocking code on run loop to let timeout code run
-            runLoop._stop()
-            #endif
+            runLoop.stop()
             let now = DispatchTime.now() + forcefullyAbortTimeout.dispatchTimeInterval
             let didNotTimeOut = timedOutSem.wait(timeout: now) != .success
             let timeoutWasNotTriggered = semTimedOutOrBlocked.wait(timeout: .now()) == .success
             if didNotTimeOut && timeoutWasNotTriggered {
                 if self.promise.resolveResult(isContinuous ? .timedOut : .blockedRunLoop) {
-                    #if canImport(CoreFoundation)
-                    CFRunLoopStop(CFRunLoopGetMain())
-                    #else
-                    RunLoop.main._stop()
-                    #endif
+                    runLoop.stop()
                 }
             }
         }
@@ -327,11 +300,7 @@ internal class Awaiter {
                     if completionCount < 2 {
                         func completeBlock() {
                             if promise.resolveResult(.completed(result)) {
-                                #if canImport(CoreFoundation)
-                                CFRunLoopStop(CFRunLoopGetMain())
-                                #else
-                                RunLoop.main._stop()
-                                #endif
+                                RunLoop.main.stop()
                             }
                         }
 
@@ -369,20 +338,12 @@ internal class Awaiter {
                 do {
                     if let result = try closure() {
                         if promise.resolveResult(.completed(result)) {
-                            #if canImport(CoreFoundation)
-                            CFRunLoopStop(CFRunLoopGetCurrent())
-                            #else
-                            RunLoop.current._stop()
-                            #endif
+                            RunLoop.current.stop()
                         }
                     }
                 } catch let error {
                     if promise.resolveResult(.errorThrown(error)) {
-                        #if canImport(CoreFoundation)
-                        CFRunLoopStop(CFRunLoopGetCurrent())
-                        #else
-                        RunLoop.current._stop()
-                        #endif
+                        RunLoop.current.stop()
                     }
                 }
             }
@@ -417,4 +378,23 @@ internal func pollBlock(
         return result
 }
 
+#if canImport(CoreFoundation)
+import CoreFoundation
+
+extension RunLoop {
+    func stop() {
+        CFRunLoopStop(getCFRunLoop())
+    }
+}
+
+#else
+
+extension RunLoop {
+    func stop() {
+        _stop()
+    }
+}
+
+#endif
+
 #endif // #if !os(WASI)

Tests/NimbleTests/PollingTest+Require.swift

@@ -1,9 +1,6 @@
 #if !os(WASI)
 
 import Dispatch
-#if canImport(CoreFoundation)
-import CoreFoundation
-#endif
 import Foundation
 import XCTest
 import Nimble