Stylistic autocorrection for Swift 4

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)

Tests/DeferredTests/ProtectedTests.swift

@@ -37,10 +37,10 @@ class ProtectedTests: XCTestCase {
     func testConcurrentReadingWriting() {
         var lastWriterDate: Date?
 
-        let startReader: (Int) -> () = { iteration in
+        let startReader: (Int) -> Void = { iteration in
             let expectation = self.expectation(description: "reader \(iteration)")
             self.queue.async {
-                self.protected.withReadLock { (arg) -> () in
+                self.protected.withReadLock { (arg) -> Void in
                     let (date, items) = arg
                     if items.isEmpty && date == nil {
                         // OK - we're before the writer has added items
@@ -59,7 +59,7 @@ class ProtectedTests: XCTestCase {
         }
         let expectation = self.expectation(description: "writer")
         self.queue.async {
-            self.protected.withWriteLock { dateItemsTuple -> () in
+            self.protected.withWriteLock { dateItemsTuple -> Void in
                 for i in 0 ..< 5 {
                     dateItemsTuple.0 = Date()
                     dateItemsTuple.1.append(i)

Tests/DeferredTests/SwiftBugTests.swift

@@ -28,7 +28,7 @@ class SwiftBugTests: XCTestCase {
         let toBeFilledWith: [SomeMultipayloadEnum: SomeMultipayloadEnum] = [
             keys[0]: .two("one"),
             keys[1]: .two("two"),
-            keys[2]: .two("three"),
+            keys[2]: .two("three")
         ]
 
         let expect = expectation(description: "upon is called with correct values")

Tests/TaskTests/ResultRecoveryTests.swift

@@ -18,7 +18,7 @@ class ResultRecoveryTests: XCTestCase {
     static var allTests: [(String, (ResultRecoveryTests) -> () throws -> Void)] {
         return [
             ("testInitWithFunctionProducesSuccesses", testInitWithFunctionProducesSuccesses),
-            ("testInitWithFunctionProducesFailures", testInitWithFunctionProducesFailures),
+            ("testInitWithFunctionProducesFailures", testInitWithFunctionProducesFailures)
         ]
     }
 

Tests/TaskTests/TaskComprehensiveTests.swift

@@ -25,7 +25,7 @@ class TaskComprehensiveTests: XCTestCase {
     static var allTests: [(String, (TaskComprehensiveTests) -> () throws -> Void)] {
         return [
             ("testThatSeveralIterationsRunCorrectly", testThatSeveralIterationsRunCorrectly),
-            ("testThatCancellingATaskPropagatesTheCancellation", testThatCancellingATaskPropagatesTheCancellation),
+            ("testThatCancellingATaskPropagatesTheCancellation", testThatCancellingATaskPropagatesTheCancellation)
         ]
     }
 

Tests/TaskTests/TaskGroupTests.swift

@@ -19,7 +19,7 @@ import Deferred
 class TaskGroupTests: XCTestCase {
     static var allTests: [(String, (TaskGroupTests) -> () throws -> Void)] {
         return [
-            ("testThatAllCompleteTaskWaitsForAllAccumulatedTasks", testThatAllCompleteTaskWaitsForAllAccumulatedTasks),
+            ("testThatAllCompleteTaskWaitsForAllAccumulatedTasks", testThatAllCompleteTaskWaitsForAllAccumulatedTasks)
         ]
     }
 

Tests/TaskTests/TaskResultTests.swift

@@ -83,7 +83,7 @@ class TaskResultTests: XCTestCase {
         XCTAssertEqual(x.value, 84)
         XCTAssertNil(x.error)
     }
-    
+
     func testInitializeWithBlockSuccess() {
         let result = Result(value: 42, error: nil)
         XCTAssertEqual(try? result.extract(), 42)

Tests/TaskTests/TaskTests.swift

@@ -265,20 +265,20 @@ class TaskTests: CustomExecutorTestCase {
         waitForExpectations()
         assertExecutorCalled(atLeast: 1)
     }
-    
+
     #endif
-    
+
     func testThatFallbackAlsoProducesANewTask() {
         let expectation = self.expectation(description: "recover produces a new task")
         let task: Task<Int> = anyFailedTask.fallback(upon: executor) { _ in
             return self.anyFinishedTask
         }
-        
+
         task.upon {
             XCTAssertEqual($0.value, 42)
             expectation.fulfill()
         }
-        
+
         waitForExpectations()
         assertExecutorCalled(2)
     }

Tests/TaskTests/TaskWorkItemTests.swift

@@ -20,7 +20,7 @@ class TaskWorkItemTests: XCTestCase {
     static var allTests: [(String, (TaskWorkItemTests) -> () throws -> Void)] {
         return [
             ("testThatCancellingATaskAfterItStartsRunningIsANoop", testThatCancellingATaskAfterItStartsRunningIsANoop),
-            ("testThatCancellingBeforeATaskStartsProducesTheCancellationError", testThatCancellingBeforeATaskStartsProducesTheCancellationError),
+            ("testThatCancellingBeforeATaskStartsProducesTheCancellationError", testThatCancellingBeforeATaskStartsProducesTheCancellationError)
         ]
     }
 

Tests/TaskTests/VoidResultTests.swift

@@ -21,7 +21,7 @@ class VoidResultTests: XCTestCase {
             ("testDescriptionFailure", testDescriptionFailure),
             ("testDebugDescriptionSuccess", testDebugDescriptionSuccess),
             ("testDebugDescriptionFailure", testDebugDescriptionFailure),
-            ("testExtract", testExtract),
+            ("testExtract", testExtract)
         ]
     }