Formatting changes

Author: adam-fowler

Sources/AsyncHTTPClient/ConnectionPool.swift

@@ -16,8 +16,8 @@ import Foundation
 import NIO
 import NIOConcurrencyHelpers
 import NIOHTTP1
-import NIOTransportServices
 import NIOTLS
+import NIOTransportServices
 
 /// A connection pool that manages and creates new connections to hosts respecting the specified preferences
 ///
@@ -376,9 +376,9 @@ final class ConnectionPool {
             self.activityPrecondition(expected: [.opened])
             let address = HTTPClient.resolveAddress(host: self.key.host, port: self.key.port, proxy: self.configuration.proxy)
             let requiresTLS = self.key.scheme == .https
-            let bootstrap : NIOClientTCPBootstrap
+            let bootstrap: NIOClientTCPBootstrap
             do {
-                bootstrap = try NIOClientTCPBootstrap.makeHTTPClientBootstrapBase(on: eventLoop, host: key.host, port: key.port, requiresTLS: requiresTLS, configuration: self.configuration)
+                bootstrap = try NIOClientTCPBootstrap.makeHTTPClientBootstrapBase(on: eventLoop, host: self.key.host, port: self.key.port, requiresTLS: requiresTLS, configuration: self.configuration)
             } catch {
                 return eventLoop.makeFailedFuture(error)
             }
@@ -396,28 +396,28 @@ final class ConnectionPool {
                 let requiresSSLHandler = self.configuration.proxy != nil && self.key.scheme == .https
                 channel.pipeline.addSSLHandlerIfNeeded(for: self.key, tlsConfiguration: self.configuration.tlsConfiguration, addSSLClient: requiresSSLHandler, handshakePromise: handshakePromise)
                 return handshakePromise.futureResult.flatMap {
-                   channel.pipeline.addHTTPClientHandlers(leftOverBytesStrategy: .forwardBytes)
+                    channel.pipeline.addHTTPClientHandlers(leftOverBytesStrategy: .forwardBytes)
                 }.flatMap {
                     #if canImport(Network)
-                    if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *), bootstrap.underlyingBootstrap is NIOTSConnectionBootstrap {
-                        return channel.pipeline.addHandler(NWErrorHandler(), position: .first)
-                    }
+                        if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *), bootstrap.underlyingBootstrap is NIOTSConnectionBootstrap {
+                            return channel.pipeline.addHandler(NWErrorHandler(), position: .first)
+                        }
                     #endif
                     return eventLoop.makeSucceededFuture(())
                 }.map {
-                   let connection = Connection(key: self.key, channel: channel, parentPool: self.parentPool)
-                   connection.isLeased = true
-                   return connection
+                    let connection = Connection(key: self.key, channel: channel, parentPool: self.parentPool)
+                    connection.isLeased = true
+                    return connection
                 }
             }.map { connection in
                 self.configureCloseCallback(of: connection)
                 return connection
             }.flatMapError { error in
                 var error = error
                 #if canImport(Network)
-                if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *), bootstrap.underlyingBootstrap is NIOTSConnectionBootstrap {
-                    error = NWErrorHandler.translateError(error)
-                }
+                    if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *), bootstrap.underlyingBootstrap is NIOTSConnectionBootstrap {
+                        error = NWErrorHandler.translateError(error)
+                    }
                 #endif
                 // This promise may not have been completed if we reach this
                 // so we fail it to avoid any leak

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -18,8 +18,8 @@ import NIOConcurrencyHelpers
 import NIOHTTP1
 import NIOHTTPCompression
 import NIOSSL
-import NIOTransportServices
 import NIOTLS
+import NIOTransportServices
 
 /// HTTPClient class provides API for request execution.
 ///
@@ -67,13 +67,13 @@ public class HTTPClient {
             self.eventLoopGroup = group
         case .createNew:
             #if canImport(Network)
-            if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
-                self.eventLoopGroup = NIOTSEventLoopGroup()
-            } else {
-                self.eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
-            }
+                if #available(OSX 10.14, iOS 12.0, tvOS 12.0, watchOS 6.0, *) {
+                    self.eventLoopGroup = NIOTSEventLoopGroup()
+                } else {
+                    self.eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+                }
             #else
-            self.eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+                self.eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
             #endif
         }
         self.configuration = configuration
@@ -694,7 +694,7 @@ extension ChannelPipeline {
                 let context = try NIOSSLContext(configuration: tlsConfiguration)
                 handlers = [
                     try NIOSSLClientHandler(context: context, serverHostname: key.host.isIPAddress ? nil : key.host),
-                    TLSEventsHandler(completionPromise: handshakePromise)
+                    TLSEventsHandler(completionPromise: handshakePromise),
                 ]
             } else {
                 handlers = [TLSEventsHandler(completionPromise: handshakePromise)]