Merge pull request #54 from noppoMan/escaping-closure

make completion closures @escaping
open-swift · Aug 11, 2016 · 6b6683f · 6b6683f
2 parents cdfd18c + 6d9dd14
commit 6b6683f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/Sources/AsyncConnection.swift b/Sources/AsyncConnection.swift
@@ -1,9 +1,9 @@
 public protocol AsyncConnection: AsyncStream {
-    func open(timingOut deadline: Double, completion: ((Void) throws -> AsyncConnection) -> Void) throws
+    func open(timingOut deadline: Double, completion: @escaping ((Void) throws -> AsyncConnection) -> Void) throws
 }
 
 extension AsyncConnection {
-    public func open(completion: ((Void) throws -> AsyncConnection) -> Void) throws {
+    public func open(completion: @escaping ((Void) throws -> AsyncConnection) -> Void) throws {
         try open(timingOut: .never, completion: completion)
     }
 }
diff --git a/Sources/AsyncDrain.swift b/Sources/AsyncDrain.swift
@@ -1,4 +1,5 @@
 public final class AsyncDrain: DataRepresentable, AsyncStream {
+
     var buffer: Data = []
     public var closed = false
 
@@ -58,7 +59,7 @@ public final class AsyncDrain: DataRepresentable, AsyncStream {
         closed = true
     }
 
-    public func receive(upTo byteCount: Int, timingOut deadline: Double = .never, completion: ((Void) throws -> Data) -> Void) {
+    public func receive(upTo byteCount: Int, timingOut deadline: Double = .never, completion: @escaping ((Void) throws -> Data) -> Void) {
         if byteCount >= buffer.count {
             completion { [unowned self] in
                 try self.close()
@@ -75,12 +76,12 @@ public final class AsyncDrain: DataRepresentable, AsyncStream {
         }
     }
 
-    public func send(_ data: Data, timingOut deadline: Double = .never, completion: ((Void) throws -> Void) -> Void) {
+    public func send(_ data: Data, timingOut deadline: Double = .never, completion: @escaping ((Void) throws -> Void) -> Void) {
         buffer += data.bytes
         completion {}
     }
 
-    public func flush(timingOut deadline: Double = .never, completion: ((Void) throws -> Void) -> Void) {
+    public func flush(timingOut deadline: Double = .never, completion: @escaping ((Void) throws -> Void) -> Void) {
         buffer = []
         completion {}
     }

diff --git a/Sources/AsyncHost.swift b/Sources/AsyncHost.swift
@@ -1,9 +1,9 @@
 public protocol AsyncHost {
-    func accept(timingOut deadline: Double, completion: ((Void) throws -> AsyncStream) -> Void)
+    func accept(timingOut deadline: Double, completion: @escaping ((Void) throws -> AsyncStream) -> Void)
 }
 
 extension AsyncHost {
-    public func accept(completion: ((Void) throws -> AsyncStream) -> Void) {
+    public func accept(completion: @escaping ((Void) throws -> AsyncStream) -> Void) {
         accept(timingOut: .never, completion: completion)
     }
 }
diff --git a/Sources/AsyncStream.swift b/Sources/AsyncStream.swift
@@ -1,27 +1,27 @@
 public protocol AsyncSending {
-    func send(_ data: Data, timingOut deadline: Double, completion: ((Void) throws -> Void) -> Void)
-    func flush(timingOut deadline: Double, completion: ((Void) throws -> Void) -> Void)
+    func send(_ data: Data, timingOut deadline: Double, completion: @escaping ((Void) throws -> Void) -> Void)
+    func flush(timingOut deadline: Double, completion: @escaping  ((Void) throws -> Void) -> Void)
 }
 
 public protocol AsyncReceiving {
-    func receive(upTo byteCount: Int, timingOut deadline: Double, completion: ((Void) throws -> Data) -> Void)
+    func receive(upTo byteCount: Int, timingOut deadline: Double, completion: @escaping ((Void) throws -> Data) -> Void)
 }
 
 public protocol AsyncSendingStream: Closable, AsyncSending {}
 public protocol AsyncReceivingStream: Closable, AsyncReceiving {}
 public protocol AsyncStream: AsyncSendingStream, AsyncReceivingStream {}
 
 extension AsyncSending {
-    public func send(_ data: Data, completion: ((Void) throws -> Void) -> Void) {
+    public func send(_ data: Data, completion: @escaping ((Void) throws -> Void) -> Void) {
         send(data, timingOut: .never, completion: completion)
     }
-    public func flush(completion: ((Void) throws -> Void) -> Void) {
+    public func flush(completion: @escaping ((Void) throws -> Void) -> Void) {
         flush(timingOut: .never, completion: completion)
     }
 }
 
 extension AsyncReceiving {
-    public func receive(upTo byteCount: Int, completion: ((Void) throws -> Data) -> Void) {
+    public func receive(upTo byteCount: Int, completion: @escaping ((Void) throws -> Data) -> Void) {
         receive(upTo: byteCount, timingOut: .never, completion: completion)
     }
 }
diff --git a/Sources/Stream.swift b/Sources/Stream.swift
@@ -12,11 +12,11 @@ public protocol ReceivingStream: Closable, Receiving {}
 public protocol Stream: SendingStream, ReceivingStream {}
 
 extension Sending {
-    public func send(_ data: Data, timingOut deadline: Double, completion: ((Void) throws -> Void) -> Void) {
+    public func send(_ data: Data, timingOut deadline: Double, completion: @escaping ((Void) throws -> Void) -> Void) {
         completion { try self.send(data, timingOut: deadline) }
     }
 
-    public func flush(timingOut deadline: Double, completion: ((Void) throws -> Void) -> Void) {
+    public func flush(timingOut deadline: Double, completion: @escaping ((Void) throws -> Void) -> Void) {
         completion { try self.flush(timingOut: deadline) }
     }
 }
@@ -32,7 +32,7 @@ extension Sending {
 }
 
 extension Receiving {
-    public func receive(upTo byteCount: Int, timingOut deadline: Double, completion: ((Void) throws -> Data) -> Void) {
+    public func receive(upTo byteCount: Int, timingOut deadline: Double, completion: @escaping ((Void) throws -> Data) -> Void) {
         completion { try self.receive(upTo: byteCount, timingOut: deadline) }
     }
 }
@@ -41,4 +41,4 @@ extension Receiving {
     public func receive(upTo byteCount: Int) throws -> Data {
         return try receive(upTo: byteCount, timingOut: .never)
     }
-}
+}