Remove #if compiler(>=5.5) (#641)

* Remove `#if compiler(>=5.5)` * Run SwiftFormat
swift-server · Oct 12, 2022 · 0bdc425 · 0bdc425
1 parent 0b5bec7
commit 0bdc425
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 150 deletions.
diff --git a/README.md b/README.md
@@ -329,11 +329,11 @@ Please have a look at [SECURITY.md](SECURITY.md) for AsyncHTTPClient's security
 
 ## Supported Versions
 
-The most recent versions of AsyncHTTPClient support Swift 5.5 and newer. The minimum Swift version supported by AsyncHTTPClient releases are detailed below:
+The most recent versions of AsyncHTTPClient support Swift 5.5.2 and newer. The minimum Swift version supported by AsyncHTTPClient releases are detailed below:
 
 AsyncHTTPClient     | Minimum Swift Version
 --------------------|----------------------
 `1.0.0 ..< 1.5.0`   | 5.0
 `1.5.0 ..< 1.10.0`  | 5.2
 `1.10.0 ..< 1.13.0` | 5.4
-`1.13.0 ...`        | 5.5
+`1.13.0 ...`        | 5.5.2
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+execute.swift b/Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+execute.swift
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
 import struct Foundation.URL
 import Logging
 import NIOCore
@@ -215,5 +214,3 @@ private actor TransactionCancelHandler {
         }
     }
 }
-
-#endif
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+shutdown.swift b/Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+shutdown.swift
@@ -14,8 +14,6 @@
 
 import NIOCore
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
-
 extension HTTPClient {
     /// Shuts down the client and `EventLoopGroup` if it was created by the client.
     @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
@@ -32,5 +30,3 @@ extension HTTPClient {
         }
     }
 }
-
-#endif
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest+Prepared.swift b/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest+Prepared.swift
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
 import struct Foundation.URL
 import NIOCore
 import NIOHTTP1
@@ -122,5 +121,3 @@ extension HTTPClientRequest {
         return newRequest
     }
 }
-
-#endif
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest.swift b/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest.swift
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
 import NIOCore
 import NIOHTTP1
 
@@ -424,5 +423,3 @@ extension HTTPClientRequest.Body {
         internal var storage: RequestBodyLength
     }
 }
-
-#endif
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse.swift b/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse.swift
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
 import NIOCore
 import NIOHTTP1
 
@@ -154,5 +153,3 @@ extension HTTPClientResponse.Body {
         .stream(CollectionOfOne(byteBuffer).async)
     }
 }
-
-#endif
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift b/Sources/AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift
@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-#if compiler(>=5.5.2) && canImport(_Concurrency)
+
 import Logging
 import NIOCore
 import NIOHTTP1
@@ -765,5 +765,3 @@ extension Transaction {
         }
     }
 }
-
-#endif
diff --git a/Sources/AsyncHTTPClient/AsyncAwait/Transaction.swift b/Sources/AsyncHTTPClient/AsyncAwait/Transaction.swift
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if compiler(>=5.5.2) && canImport(_Concurrency)
 import Logging
 import NIOConcurrencyHelpers
 import NIOCore
@@ -362,4 +361,3 @@ extension Transaction {
         self.performFailAction(action)
     }
 }
-#endif
diff --git a/Sources/AsyncHTTPClient/HTTPClient.swift b/Sources/AsyncHTTPClient/HTTPClient.swift
@@ -904,10 +904,8 @@ extension HTTPClient.EventLoopGroupProvider: Sendable {}
 extension HTTPClient.EventLoopPreference: Sendable {}
 #endif
 
-#if swift(>=5.5) && canImport(_Concurrency)
 // HTTPClient is thread-safe because its shared mutable state is protected through a lock
 extension HTTPClient: @unchecked Sendable {}
-#endif
 
 extension HTTPClient.Configuration {
     /// Timeout configuration.

diff --git a/Sources/AsyncHTTPClient/HTTPHandler.swift b/Sources/AsyncHTTPClient/HTTPHandler.swift
@@ -779,9 +779,7 @@ extension HTTPClient {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
 extension HTTPClient.Task: @unchecked Sendable {}
-#endif
 
 internal struct TaskCancelEvent {}
 

diff --git a/Sources/AsyncHTTPClient/SSLContextCache.swift b/Sources/AsyncHTTPClient/SSLContextCache.swift
@@ -56,6 +56,4 @@ extension SSLContextCache {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
 extension SSLContextCache: @unchecked Sendable {}
-#endif
diff --git a/Sources/AsyncHTTPClient/UnsafeTransfer.swift b/Sources/AsyncHTTPClient/UnsafeTransfer.swift
@@ -26,6 +26,4 @@ final class UnsafeMutableTransferBox<Wrapped> {
     }
 }
 
-#if swift(>=5.5) && canImport(_Concurrency)
 extension UnsafeMutableTransferBox: @unchecked Sendable {}
-#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -779,9 +779,7 @@ extension HTTPClient { @@
         }
     }
-    #if swift(>=5.5) && canImport(_Concurrency)
     extension HTTPClient.Task: @unchecked Sendable {}
-    #endif
     internal struct TaskCancelEvent {}
@@ Expand Down @@