Merge pull request #12 from tomohisa/master

'upgrade' name conflict 
ZewoGraveyard · May 2, 2016 · 285c0cf · 285c0cf
2 parents 47c1750 + b70bb70
commit 285c0cf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/Sources/Request.swift b/Sources/Request.swift
@@ -23,79 +23,79 @@
 // SOFTWARE.
 
 extension Request {
-    public typealias Upgrade = (Response, Stream) throws -> Void
+    public typealias DidUpgrade = (Response, Stream) throws -> Void
 
-    public var upgrade: Upgrade? {
+    public var didUpgrade: DidUpgrade? {
         get {
-            return storage["request-upgrade"] as? Upgrade
+            return storage["request-upgrade"] as? DidUpgrade
         }
 
-        set(upgrade) {
-            storage["request-upgrade"] = upgrade
+        set(didUpgrade) {
+            storage["request-upgrade"] = didUpgrade
         }
     }
 }
 
 extension Request {
-    public init(method: Method = .get, uri: URI = URI(path: "/"), headers: Headers = [:], body: Stream, upgrade: Upgrade?) {
+    public init(method: Method = .get, uri: URI = URI(path: "/"), headers: Headers = [:], body: Stream, didUpgrade: DidUpgrade?) {
         self.init(
             method: method,
             uri: uri,
             headers: headers,
             body: body
         )
 
-        self.upgrade = upgrade
+        self.didUpgrade = didUpgrade
     }
 
-    public init(method: Method = .get, uri: URI = URI(path: "/"), headers: Headers = [:], body: Data = Data(), upgrade: Upgrade?) {
+    public init(method: Method = .get, uri: URI = URI(path: "/"), headers: Headers = [:], body: Data = Data(), didUpgrade: DidUpgrade?) {
         self.init(
             method: method,
             uri: uri,
             headers: headers,
             body: body
         )
 
-        self.upgrade = upgrade
+        self.didUpgrade = didUpgrade
     }
 
-    public init(method: Method = .get, uri: URI = URI(path: "/"), headers: Headers = [:], body: DataConvertible, upgrade: Upgrade? = nil) {
+    public init(method: Method = .get, uri: URI = URI(path: "/"), headers: Headers = [:], body: DataConvertible, didUpgrade: DidUpgrade? = nil) {
         self.init(
             method: method,
             uri: uri,
             headers: headers,
             body: body.data,
-            upgrade: upgrade
+            didUpgrade: didUpgrade
         )
     }
 
-    public init(method: Method = .get, uri: String, headers: Headers = [:], body: Data = Data(), upgrade: Upgrade? = nil) throws {
+    public init(method: Method = .get, uri: String, headers: Headers = [:], body: Data = Data(), didUpgrade: DidUpgrade? = nil) throws {
         self.init(
             method: method,
             uri: try URI(uri),
             headers: headers,
             body: body,
-            upgrade: upgrade
+            didUpgrade: didUpgrade
         )
     }
 
-    public init(method: Method = .get, uri: String, headers: Headers = [:], body: DataConvertible, upgrade: Upgrade? = nil) throws {
+    public init(method: Method = .get, uri: String, headers: Headers = [:], body: DataConvertible, didUpgrade: DidUpgrade? = nil) throws {
         try self.init(
             method: method,
             uri: uri,
             headers: headers,
             body: body.data,
-            upgrade: upgrade
+            didUpgrade: didUpgrade
         )
     }
 
-    public init(method: Method = .get, uri: String, headers: Headers = [:], body: Stream, upgrade: Upgrade? = nil) throws {
+    public init(method: Method = .get, uri: String, headers: Headers = [:], body: Stream, didUpgrade: DidUpgrade? = nil) throws {
         self.init(
             method: method,
             uri: try URI(uri),
             headers: headers,
             body: body,
-            upgrade: upgrade
+            didUpgrade: didUpgrade
         )
     }
 }
@@ -216,4 +216,4 @@ extension Request: CustomDebugStringConvertible {
     public var debugDescription: String {
         return description + "\n\n" + storageDescription
     }
-}
+}
diff --git a/Sources/Response.swift b/Sources/Response.swift
@@ -23,46 +23,46 @@
 // SOFTWARE.
 
 extension Response {
-    public typealias Upgrade = (Request, Stream) throws -> Void
+    public typealias DidUpgrade = (Request, Stream) throws -> Void
 
-    public var upgrade: Upgrade? {
+    public var didUpgrade: DidUpgrade? {
         get {
-            return storage["response-connection-upgrade"] as? Upgrade
+            return storage["response-connection-upgrade"] as? DidUpgrade
         }
 
-        set(upgrade) {
-            storage["response-connection-upgrade"] = upgrade
+        set(didUpgrade) {
+            storage["response-connection-upgrade"] = didUpgrade
         }
     }
 }
 
 extension Response {
-    public init(status: Status = .ok, headers: Headers = [:], body: Stream, upgrade: Upgrade?) {
+    public init(status: Status = .ok, headers: Headers = [:], body: Stream, didUpgrade: DidUpgrade?) {
         self.init(
             status: status,
             headers: headers,
             body: body
         )
 
-        self.upgrade = upgrade
+        self.didUpgrade = didUpgrade
     }
 
-    public init(status: Status = .ok, headers: Headers = [:], body: Data = Data(), upgrade: Upgrade?) {
+    public init(status: Status = .ok, headers: Headers = [:], body: Data = Data(), didUpgrade: DidUpgrade?) {
         self.init(
             status: status,
             headers: headers,
             body: body
         )
 
-        self.upgrade = upgrade
+        self.didUpgrade = didUpgrade
     }
 
-    public init(status: Status = .ok, headers: Headers = [:], body: DataConvertible, upgrade: Upgrade? = nil) {
+    public init(status: Status = .ok, headers: Headers = [:], body: DataConvertible, didUpgrade: DidUpgrade? = nil) {
         self.init(
             status: status,
             headers: headers,
             body: body.data,
-            upgrade: upgrade
+            didUpgrade: didUpgrade
         )
     }
 }