From 1ea91fa9f4268d0ef9bc3498409d188901e3124b Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Wed, 3 Aug 2022 09:28:07 +0100 Subject: [PATCH 1/2] Remove the last remaining NIOAtomic Motivation Warnings aren't great, and NIOAtomic is deprecated. Modifications Replace the last use of NIOAtomic with ManagedAtomic. Result Fewer warnings Fixes #606 --- Sources/AsyncHTTPClient/HTTPClient.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/AsyncHTTPClient/HTTPClient.swift b/Sources/AsyncHTTPClient/HTTPClient.swift index 1f08fb41d..5681555e7 100644 --- a/Sources/AsyncHTTPClient/HTTPClient.swift +++ b/Sources/AsyncHTTPClient/HTTPClient.swift @@ -13,6 +13,7 @@ //===----------------------------------------------------------------------===// import Foundation +import Atomics import Logging import NIOConcurrencyHelpers import NIOCore @@ -36,7 +37,7 @@ extension Logger { } } -let globalRequestID = NIOAtomic.makeAtomic(value: 0) +let globalRequestID = ManagedAtomic(0) /// HTTPClient class provides API for request execution. /// @@ -541,7 +542,7 @@ public class HTTPClient { logger originalLogger: Logger?, redirectState: RedirectState? ) -> Task { - let logger = (originalLogger ?? HTTPClient.loggingDisabled).attachingRequestInformation(request, requestID: globalRequestID.add(1)) + let logger = (originalLogger ?? HTTPClient.loggingDisabled).attachingRequestInformation(request, requestID: globalRequestID.wrappingIncrementThenLoad(ordering: .relaxed)) let taskEL: EventLoop switch eventLoopPreference.preference { case .indifferent: From 63ea00b1378038d602e5c38240a9653271596ea0 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Wed, 3 Aug 2022 09:46:02 +0100 Subject: [PATCH 2/2] Import order --- Sources/AsyncHTTPClient/HTTPClient.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/AsyncHTTPClient/HTTPClient.swift b/Sources/AsyncHTTPClient/HTTPClient.swift index 5681555e7..094a6d052 100644 --- a/Sources/AsyncHTTPClient/HTTPClient.swift +++ b/Sources/AsyncHTTPClient/HTTPClient.swift @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -import Foundation import Atomics +import Foundation import Logging import NIOConcurrencyHelpers import NIOCore