Skip to content

Commit 5908084

Browse files
committed
fix merge conflicts
1 parent 5e0032f commit 5908084

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

Sources/AsyncHTTPClient/ConnectionPool/State Machine/HTTPConnectionPool+StateMachine.swift

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,6 @@ extension HTTPConnectionPool {
6969

7070
enum HTTPVersionState {
7171
case http1(HTTP1StateMachine)
72-
case http2(HTTP2StateMachine)
73-
74-
mutating func modify<ReturnValue>(
75-
http1: (inout HTTP1StateMachine) -> ReturnValue,
76-
http2: (inout HTTP2StateMachine) -> ReturnValue
77-
) -> ReturnValue {
78-
let returnValue: ReturnValue
79-
switch self {
80-
case .http1(var http1State):
81-
returnValue = http1(&http1State)
82-
self = .http1(http1State)
83-
case .http2(var http2State):
84-
returnValue = http2(&http2State)
85-
self = .http2(http2State)
86-
}
87-
return returnValue
88-
}
8972
}
9073

9174
var state: HTTPVersionState
@@ -239,6 +222,10 @@ extension HTTPConnectionPool.StateMachine: CustomStringConvertible {
239222
switch self.state {
240223
case .http1(let http1):
241224
return ".http1(\(http1))"
225+
}
226+
}
227+
}
228+
242229
extension HTTPConnectionPool.StateMachine {
243230
struct ConnectionMigrationAction {
244231
var closeConnections: [HTTPConnectionPool.Connection]

0 commit comments

Comments
 (0)