Stylistic autocorrection for Swift 4

Author: zwaldowski

Sources/Task/ExistentialTask.swift

@@ -96,11 +96,11 @@ public final class Task<SuccessValue>: NSObject {
 extension Task: FutureProtocol {
     public typealias Value = Result
 
-    public func upon(_ queue: PreferredExecutor, execute body: @escaping(Result) -> ()) {
+    public func upon(_ queue: PreferredExecutor, execute body: @escaping(Result) -> Void) {
         future.upon(queue, execute: body)
     }
 
-    public func upon(_ executor: Executor, execute body: @escaping(Result) -> ()) {
+    public func upon(_ executor: Executor, execute body: @escaping(Result) -> Void) {
         future.upon(executor, execute: body)
     }
 

Sources/Task/ResultPromise.swift

@@ -35,4 +35,3 @@ extension PromiseProtocol where Value: Either, Value.Right == Void {
         return succeed(with: ())
     }
 }
-

Sources/Task/TaskProgress.swift

@@ -71,7 +71,7 @@ private final class ProxyProgress: Progress {
         return [ #keyPath(observee.userInfo) ]
     }
 
-    override var userInfo: [ProgressUserInfoKey : Any] {
+    override var userInfo: [ProgressUserInfoKey: Any] {
         return observee.userInfo
     }
 
@@ -136,7 +136,7 @@ private final class ProxyProgress: Progress {
             observee.removeObserver(self, forKeyPath: #keyPath(Progress.paused), context: Observation.pausedContext)
         }
 
-        override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
             guard let keyPath = keyPath, object != nil, bnr_atomic_bitmask_test(&state, State.ready.rawValue), let observer = observer, let newValue = change?[.newKey] else { return }
             switch context {
             case Observation.cancelledContext?:
@@ -318,4 +318,3 @@ extension Task {
 }
 
 #endif
-

Sources/Task/TaskRecovery.swift

@@ -22,7 +22,7 @@ extension Task {
     public func recover(upon executor: PreferredExecutor, substituting substitution: @escaping(Error) throws -> SuccessValue) -> Task<SuccessValue> {
         return recover(upon: executor as Executor, substituting: substitution)
     }
-    
+
     /// Returns a `Task` containing the result of mapping `substitution` over
     /// the failed task's error.
     ///
@@ -57,7 +57,7 @@ extension Task {
         return Task<SuccessValue>(future: future, cancellation: cancel)
         #endif
     }
-    
+
     /// Begins another task in the case of the failure of `self` by calling
     /// `restartTask` with the error.
     ///
@@ -69,7 +69,7 @@ extension Task {
     public func fallback<NewTask: FutureProtocol>(upon executor: PreferredExecutor, to restartTask: @escaping(Error) -> NewTask) -> Task<SuccessValue> where NewTask.Value: Either, NewTask.Value.Left == Error, NewTask.Value.Right == SuccessValue {
         return fallback(upon: executor as Executor, to: restartTask)
     }
-    
+
     /// Begins another task in the case of the failure of `self` by calling
     /// `restartTask` with the error.
     ///
@@ -87,13 +87,13 @@ extension Task {
         #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
         let progress = extendedProgress(byUnitCount: 1)
         #endif
-        
+
         let future: Future<Result> = andThen(upon: executor) { (result) -> Task<SuccessValue> in
             #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
             progress.becomeCurrent(withPendingUnitCount: 1)
             defer { progress.resignCurrent() }
             #endif
-            
+
             do {
                 let value = try result.extract()
                 return Task(success: value)

Sources/Task/TaskResult.swift

@@ -55,4 +55,3 @@ extension Task.Result where SuccessValue == Void {
     }
 
 }
-

Tests/DeferredTests/ExistentialFutureTests.swift

@@ -16,7 +16,7 @@ class ExistentialFutureTests: XCTestCase {
             ("testAnyWaitWithTimeout", testAnyWaitWithTimeout),
             ("testFilledAnyFutureUpon", testFilledAnyFutureUpon),
             ("testUnfilledAnyUponCalledWhenFilled", testUnfilledAnyUponCalledWhenFilled),
-            ("testFillAndIsFilledPostcondition", testFillAndIsFilledPostcondition),
+            ("testFillAndIsFilledPostcondition", testFillAndIsFilledPostcondition)
         ]
     }
 

Tests/DeferredTests/FutureCustomExecutorTests.swift

@@ -14,7 +14,7 @@ class FutureCustomExecutorTests: CustomExecutorTestCase {
         return [
             ("testUpon", testUpon),
             ("testMap", testMap),
-            ("testAndThen", testAndThen),
+            ("testAndThen", testAndThen)
         ]
     }
 

Tests/DeferredTests/FutureIgnoreTests.swift

@@ -13,7 +13,7 @@ class FutureIgnoreTests: XCTestCase {
     static var allTests: [(String, (FutureIgnoreTests) -> () throws -> Void)] {
         return [
             ("testWaitWithTimeout", testWaitWithTimeout),
-            ("testIgnoredUponCalledWhenFilled", testIgnoredUponCalledWhenFilled),
+            ("testIgnoredUponCalledWhenFilled", testIgnoredUponCalledWhenFilled)
         ]
     }
 

Tests/DeferredTests/FutureTests.swift

@@ -22,7 +22,7 @@ class FutureTests: XCTestCase {
             ("testAnd", testAnd),
             ("testAllFilled", testAllFilled),
             ("testAllFilledEmptyCollection", testAllFilledEmptyCollection),
-            ("testFirstFilled", testFirstFilled),
+            ("testFirstFilled", testFirstFilled)
         ]
     }
 

Tests/DeferredTests/LockingTests.swift

@@ -120,7 +120,7 @@ class LockingTests: XCTestCase {
         for lock in allLocks {
             var x = UnsafeAtomicCounter()
 
-            let startReader: (Int) -> () = { i in
+            let startReader: (Int) -> Void = { i in
                 let expectation = self.expectation(description: "reader \(i)")
                 self.queue.async {
                     lock.withReadLock {
@@ -158,7 +158,7 @@ class LockingTests: XCTestCase {
     }
 
     func measureReadsSingleThread(lock: Locking, iterations: Int, file: StaticString = #file, line: Int = #line) {
-        let doNothing: () -> () = {}
+        let doNothing: () -> Void = {}
         func body() {
             for _ in 0 ..< iterations {
                 lock.withReadLock(doNothing)
@@ -173,7 +173,7 @@ class LockingTests: XCTestCase {
     }
 
     func measureWritesSingleThread(lock: Locking, iterations: Int, file: StaticString = #file, line: Int = #line) {
-        let doNothing: () -> () = {}
+        let doNothing: () -> Void = {}
         func body() {
             for _ in 0 ..< iterations {
                 lock.withWriteLock(doNothing)