Merge pull request #77 from KelvinJin/swift/3.0

Updated for Xcode 8 GM.

Author: inamiy

SwiftTask/SwiftTask.swift

@@ -68,11 +68,11 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
     public typealias Configuration = TaskConfiguration
 
     public typealias PromiseInitClosure = (_ fulfill: FulfillHandler, _ reject: RejectHandler) -> Void
-    public typealias InitClosure = (_ progress: ProgressHandler, _ fulfill: FulfillHandler, _ reject: RejectHandler, _ configure: TaskConfiguration) -> Void
+    public typealias InitClosure = (_ progress: @escaping ProgressHandler, _ fulfill: @escaping FulfillHandler, _ reject: @escaping RejectHandler, _ configure: TaskConfiguration) -> Void
 
     internal typealias _Machine = _StateMachine<Progress, Value, Error>
 
-    internal typealias _InitClosure = (_ machine: _Machine, _ progress: ProgressHandler, _ fulfill: FulfillHandler, _ _reject: _RejectInfoHandler, _ configure: TaskConfiguration) -> Void
+    internal typealias _InitClosure = (_ machine: _Machine, _ progress: @escaping ProgressHandler, _ fulfill: @escaping FulfillHandler, _ _reject: @escaping _RejectInfoHandler, _ configure: TaskConfiguration) -> Void
 
     internal typealias _ProgressTupleHandler = (ProgressTuple) -> Void
     internal typealias _RejectInfoHandler = (ErrorInfo) -> Void
@@ -126,7 +126,7 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
     ///
     /// - Returns: New task.
     ///
-    public init(weakified: Bool, paused: Bool, initClosure: InitClosure)
+    public init(weakified: Bool, paused: Bool, initClosure: @escaping InitClosure)
     {
         self._weakified = weakified
         self._paused = paused
@@ -145,7 +145,7 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
     ///
     /// - e.g. Task<P, V, E>(paused: false) { progress, fulfill, reject, configure in ... }
     ///
-    public convenience init(paused: Bool, initClosure: InitClosure)
+    public convenience init(paused: Bool, initClosure: @escaping InitClosure)
     {
         self.init(weakified: false, paused: paused, initClosure: initClosure)
     }
@@ -155,7 +155,7 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
     ///
     /// - e.g. Task<P, V, E> { progress, fulfill, reject, configure in ... }
     ///
-    public convenience init(initClosure: InitClosure)
+    public convenience init(initClosure: @escaping InitClosure)
     {
         self.init(weakified: false, paused: false, initClosure: initClosure)
     }
@@ -191,7 +191,7 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
     ///
     /// - e.g. Task<Any, Value, Error> { fulfill, reject in ... }
     ///
-    public convenience init(promiseInitClosure: PromiseInitClosure)
+    public convenience init(promiseInitClosure: @escaping PromiseInitClosure)
     {
         self.init(initClosure: { progress, fulfill, reject, configure in
             promiseInitClosure(fulfill, { error in reject(error) })
@@ -200,7 +200,7 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
 
     /// internal-init for accessing `machine` inside `_initClosure`
     /// (NOTE: _initClosure has _RejectInfoHandler as argument)
-    internal init(weakified: Bool = false, paused: Bool = false, _initClosure: _InitClosure)
+    internal init(weakified: Bool = false, paused: Bool = false, _initClosure: @escaping _InitClosure)
     {
         self._weakified = weakified
         self._paused = paused
@@ -210,7 +210,7 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
     }
 
     // NOTE: don't use `internal init` for this setup method, or this will be a designated initializer
-    internal func setup(weakified: Bool, paused: Bool, _initClosure: _InitClosure)
+    internal func setup(weakified: Bool, paused: Bool, _initClosure: @escaping _InitClosure)
     {
 //        #if DEBUG
 //            let addr = String(format: "%p", unsafeAddressOf(self))
@@ -620,9 +620,9 @@ open class Task<Progress, Value, Error>: Cancellable, CustomStringConvertible
 internal func _bindInnerTask<Progress2, Value2, Error, Error2>(
     _ innerTask: Task<Progress2, Value2, Error2>,
     _ newMachine: _StateMachine<Progress2, Value2, Error>,
-    _ progress: Task<Progress2, Value2, Error>.ProgressHandler,
-    _ fulfill: Task<Progress2, Value2, Error>.FulfillHandler,
-    _ _reject: Task<Progress2, Value2, Error>._RejectInfoHandler,
+    _ progress: @escaping Task<Progress2, Value2, Error>.ProgressHandler,
+    _ fulfill: @escaping Task<Progress2, Value2, Error>.FulfillHandler,
+    _ _reject: @escaping Task<Progress2, Value2, Error>._RejectInfoHandler,
     _ configure: TaskConfiguration
     )
 {

SwiftTask/_StateMachine.swift

@@ -43,7 +43,7 @@ internal class _StateMachine<Progress, Value, Error>
         self.state = _Atomic(paused ? .Paused : .Running)
     }
 
-    @discardableResult internal func addProgressTupleHandler(_ token: inout _HandlerToken?, _ progressTupleHandler: ProgressTupleHandler) -> Bool
+    @discardableResult internal func addProgressTupleHandler(_ token: inout _HandlerToken?, _ progressTupleHandler: @escaping ProgressTupleHandler) -> Bool
     {
         self._lock.lock()
         defer { self._lock.unlock() }