Skip to content

Commit 34f8a34

Browse files
committed
SwiftFormat
1 parent 4243ab8 commit 34f8a34

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ extension HTTPConnectionPool {
324324
mutating func cancelRequest(_ requestID: Request.ID) -> Action {
325325
// 1. check requests in queue
326326
if let request = self.requests.remove(requestID) {
327-
let error = lastConnectFailure ?? HTTPClientError.cancelled
327+
let error = self.lastConnectFailure ?? HTTPClientError.cancelled
328328
return .init(
329329
request: .failRequest(request, error, cancelTimeout: true),
330330
connection: .none

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ extension HTTPConnectionPool {
445445
mutating func cancelRequest(_ requestID: Request.ID) -> Action {
446446
// 1. check requests in queue
447447
if let request = self.requests.remove(requestID) {
448-
let error = lastConnectFailure ?? HTTPClientError.cancelled
448+
let error = self.lastConnectFailure ?? HTTPClientError.cancelled
449449
return .init(
450450
request: .failRequest(request, error, cancelTimeout: true),
451451
connection: .none

Sources/AsyncHTTPClient/RequestBag+StateMachine.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ extension RequestBag.StateMachine {
532532
preconditionFailure()
533533
}
534534
}
535-
535+
536536
enum CancelAction {
537537
case cancelScheduler(HTTPRequestScheduler?)
538538
case fail(FailAction)

Sources/AsyncHTTPClient/RequestBag.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ final class RequestBag<Delegate: HTTPClientResponseDelegate> {
322322

323323
self.executeFailAction0(action)
324324
}
325-
325+
326326
private func executeFailAction0(_ action: RequestBag<Delegate>.StateMachine.FailAction) {
327327
switch action {
328328
case .failTask(let error, let scheduler, let executor):
@@ -335,7 +335,7 @@ final class RequestBag<Delegate: HTTPClientResponseDelegate> {
335335
break
336336
}
337337
}
338-
338+
339339
private func cancel0(_ reason: CancelationReason) {
340340
self.task.eventLoop.assertInEventLoop()
341341

@@ -353,7 +353,7 @@ final class RequestBag<Delegate: HTTPClientResponseDelegate> {
353353
enum CancelationReason {
354354
case userInitiated
355355
case deadlineExceeded
356-
356+
357357
var error: HTTPClientError {
358358
switch self {
359359
case .userInitiated:

Tests/AsyncHTTPClientTests/HTTPClientTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ class HTTPClientTests: XCTestCase {
12681268
#endif
12691269
}
12701270
}
1271-
1271+
12721272
func testSelfSignedCertificateIsRejectedWithCorrectErrorIfRequestDeadlineIsExceeded() throws {
12731273
/// key + cert was created with the follwing command:
12741274
/// openssl req -x509 -newkey rsa:4096 -keyout self_signed_key.pem -out self_signed_cert.pem -sha256 -days 99999 -nodes -subj '/CN=localhost'
@@ -1292,7 +1292,7 @@ class HTTPClientTests: XCTestCase {
12921292
config.timeout.connect = .seconds(3)
12931293
let localClient = HTTPClient(eventLoopGroupProvider: .shared(self.clientGroup), configuration: config)
12941294
defer { XCTAssertNoThrow(try localClient.syncShutdown()) }
1295-
1295+
12961296
XCTAssertThrowsError(try localClient.get(url: "https://localhost:\(port)", deadline: .now() + .seconds(2)).wait()) { error in
12971297
#if canImport(Network)
12981298
guard let nwTLSError = error as? HTTPClient.NWTLSError else {

Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP1StateTests.swift

-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class HTTPConnectionPool_HTTP1StateMachineTests: XCTestCase {
6666

6767
// fail all connection attempts
6868
while let randomConnectionID = connections.randomStartingConnection() {
69-
70-
7169
XCTAssertNoThrow(try connections.failConnectionCreation(randomConnectionID))
7270
let action = state.failedToCreateNewConnection(SomeError(), connectionID: randomConnectionID)
7371

0 commit comments

Comments
 (0)