Refactor withCheckedThrowingContinuation calls to get rid of warnings (#7981)

valeriyvan · web-flow · commit b31ef40ac749 · 2024-09-19T07:26:21.000-07:00
diff --git a/Sources/Basics/HTTPClient/LegacyHTTPClient.swift b/Sources/Basics/HTTPClient/LegacyHTTPClient.swift
@@ -314,8 +314,8 @@ extension LegacyHTTPClient {
         options: Request.Options = .init(),
         observabilityScope: ObservabilityScope? = .none
     ) async throws -> Response {
-        try await withCheckedThrowingContinuation {
-            self.head(url, headers: headers, options: options, completion: $0.resume(with:))
+        try await withCheckedThrowingContinuation { continuation in
+            self.head(url, headers: headers, options: options, completion: { continuation.resume(with: $0) })
         }
     }
     @available(*, noasync, message: "Use the async alternative")
@@ -339,8 +339,8 @@ extension LegacyHTTPClient {
         options: Request.Options = .init(),
         observabilityScope: ObservabilityScope? = .none
     ) async throws -> Response {
-        try await withCheckedThrowingContinuation {
-            self.get(url, headers: headers, options: options, completion: $0.resume(with:))
+        try await withCheckedThrowingContinuation { continuation in
+            self.get(url, headers: headers, options: options, completion: { continuation.resume(with: $0) })
         }
     }
     @available(*, noasync, message: "Use the async alternative")
diff --git a/Sources/PackageRegistry/RegistryDownloadsManager.swift b/Sources/PackageRegistry/RegistryDownloadsManager.swift
@@ -52,14 +52,14 @@ public class RegistryDownloadsManager: Cancellable {
         delegateQueue: DispatchQueue,
         callbackQueue: DispatchQueue
     ) async throws -> AbsolutePath {
-        try await withCheckedThrowingContinuation {
+        try await withCheckedThrowingContinuation { continuation in
             self.lookup(
                 package: package,
                 version: version,
                 observabilityScope: observabilityScope,
                 delegateQueue: delegateQueue,
                 callbackQueue: callbackQueue,
-                completion: $0.resume(with:)
+                completion: { continuation.resume(with: $0) }
             )
         }
     }
diff --git a/Sources/PackageRegistry/SignatureValidation.swift b/Sources/PackageRegistry/SignatureValidation.swift
@@ -64,7 +64,7 @@ struct SignatureValidation {
         observabilityScope: ObservabilityScope,
         callbackQueue: DispatchQueue
     ) async throws -> SigningEntity? {
-        try await withCheckedThrowingContinuation {
+        try await withCheckedThrowingContinuation { continuation in
             self.validate(
                 registry: registry,
                 package: package,
@@ -75,7 +75,7 @@ struct SignatureValidation {
                 fileSystem: fileSystem,
                 observabilityScope: observabilityScope, 
                 callbackQueue: callbackQueue,
-                completion: $0.resume(with:)
+                completion: { continuation.resume(with: $0) }
             )
         }
     }
@@ -326,7 +326,7 @@ struct SignatureValidation {
         observabilityScope: ObservabilityScope,
         callbackQueue: DispatchQueue
     ) async throws -> SigningEntity? {
-        try await withCheckedThrowingContinuation {
+        try await withCheckedThrowingContinuation { continuation in
             self.validate(
                 registry: registry,
                 package: package,
@@ -338,7 +338,7 @@ struct SignatureValidation {
                 fileSystem:fileSystem,
                 observabilityScope: observabilityScope, 
                 callbackQueue: callbackQueue,
-                completion: $0.resume(with:)
+                completion: { continuation.resume(with: $0) }
             )
         }
     }
@@ -582,13 +582,13 @@ struct SignatureValidation {
         configuration: RegistryConfiguration.Security.Signing,
         fileSystem: FileSystem
     ) async throws ->  SigningEntity? {
-        try await withCheckedThrowingContinuation {
+        try await withCheckedThrowingContinuation { continuation in
             SignatureValidation.extractSigningEntity(
                 signature: signature,
                 signatureFormat: signatureFormat,
                 configuration: configuration,
                 fileSystem: fileSystem,
-                completion: $0.resume(with:)
+                completion: { continuation.resume(with: $0) }
             )
         }
     }
diff --git a/Sources/PackageRegistry/SigningEntityTOFU.swift b/Sources/PackageRegistry/SigningEntityTOFU.swift
@@ -39,15 +39,15 @@ struct PackageSigningEntityTOFU {
         observabilityScope: ObservabilityScope,
         callbackQueue: DispatchQueue
     ) async throws {
-        try await withCheckedThrowingContinuation {
+        try await withCheckedThrowingContinuation { continuation in
             self.validate(
                 registry: registry,
                 package: package,
                 version: version,
                 signingEntity: signingEntity,
                 observabilityScope: observabilityScope,
                 callbackQueue: callbackQueue,
-                completion: $0.resume(with:)
+                completion: { continuation.resume(with: $0) }
             )
         }
     }
diff --git a/Sources/SourceControl/RepositoryManager.swift b/Sources/SourceControl/RepositoryManager.swift
@@ -99,15 +99,15 @@ public class RepositoryManager: Cancellable {
         delegateQueue: DispatchQueue,
         callbackQueue: DispatchQueue
     ) async throws -> RepositoryHandle {
-        try await withCheckedThrowingContinuation {
+        try await withCheckedThrowingContinuation { continuation in
             self.lookup(
                 package: package,
                 repository: repository,
                 updateStrategy: updateStrategy,
                 observabilityScope: observabilityScope,
                 delegateQueue: delegateQueue,
                 callbackQueue: callbackQueue,
-                completion: $0.resume(with:)
+                completion: { continuation.resume(with: $0) }
             )
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,8 @@ extension LegacyHTTPClient {`
`314`	`314`	`options: Request.Options = .init(),`
`315`	`315`	`observabilityScope: ObservabilityScope? = .none`
`316`	`316`	`) async throws -> Response {`
`317`		`- try await withCheckedThrowingContinuation {`
`318`		`- self.head(url, headers: headers, options: options, completion: $0.resume(with:))`
	`317`	`+ try await withCheckedThrowingContinuation { continuation in`
	`318`	`+ self.head(url, headers: headers, options: options, completion: { continuation.resume(with: $0) })`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`	`@available(*, noasync, message: "Use the async alternative")`
`@@ -339,8 +339,8 @@ extension LegacyHTTPClient {`
`339`	`339`	`options: Request.Options = .init(),`
`340`	`340`	`observabilityScope: ObservabilityScope? = .none`
`341`	`341`	`) async throws -> Response {`
`342`		`- try await withCheckedThrowingContinuation {`
`343`		`- self.get(url, headers: headers, options: options, completion: $0.resume(with:))`
	`342`	`+ try await withCheckedThrowingContinuation { continuation in`
	`343`	`+ self.get(url, headers: headers, options: options, completion: { continuation.resume(with: $0) })`
`344`	`344`	`}`
`345`	`345`	`}`
`346`	`346`	`@available(*, noasync, message: "Use the async alternative")`
Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,14 @@ public class RegistryDownloadsManager: Cancellable {`
`52`	`52`	`delegateQueue: DispatchQueue,`
`53`	`53`	`callbackQueue: DispatchQueue`
`54`	`54`	`) async throws -> AbsolutePath {`
`55`		`- try await withCheckedThrowingContinuation {`
	`55`	`+ try await withCheckedThrowingContinuation { continuation in`
`56`	`56`	`self.lookup(`
`57`	`57`	`package: package,`
`58`	`58`	`version: version,`
`59`	`59`	`observabilityScope: observabilityScope,`
`60`	`60`	`delegateQueue: delegateQueue,`
`61`	`61`	`callbackQueue: callbackQueue,`
`62`		`- completion: $0.resume(with:)`
	`62`	`+ completion: { continuation.resume(with: $0) }`
`63`	`63`	`)`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct SignatureValidation {`
`64`	`64`	`observabilityScope: ObservabilityScope,`
`65`	`65`	`callbackQueue: DispatchQueue`
`66`	`66`	`) async throws -> SigningEntity? {`
`67`		`- try await withCheckedThrowingContinuation {`
	`67`	`+ try await withCheckedThrowingContinuation { continuation in`
`68`	`68`	`self.validate(`
`69`	`69`	`registry: registry,`
`70`	`70`	`package: package,`
`@@ -75,7 +75,7 @@ struct SignatureValidation {`
`75`	`75`	`fileSystem: fileSystem,`
`76`	`76`	`observabilityScope: observabilityScope,`
`77`	`77`	`callbackQueue: callbackQueue,`
`78`		`- completion: $0.resume(with:)`
	`78`	`+ completion: { continuation.resume(with: $0) }`
`79`	`79`	`)`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -326,7 +326,7 @@ struct SignatureValidation {`
`326`	`326`	`observabilityScope: ObservabilityScope,`
`327`	`327`	`callbackQueue: DispatchQueue`
`328`	`328`	`) async throws -> SigningEntity? {`
`329`		`- try await withCheckedThrowingContinuation {`
	`329`	`+ try await withCheckedThrowingContinuation { continuation in`
`330`	`330`	`self.validate(`
`331`	`331`	`registry: registry,`
`332`	`332`	`package: package,`
`@@ -338,7 +338,7 @@ struct SignatureValidation {`
`338`	`338`	`fileSystem:fileSystem,`
`339`	`339`	`observabilityScope: observabilityScope,`
`340`	`340`	`callbackQueue: callbackQueue,`
`341`		`- completion: $0.resume(with:)`
	`341`	`+ completion: { continuation.resume(with: $0) }`
`342`	`342`	`)`
`343`	`343`	`}`
`344`	`344`	`}`
`@@ -582,13 +582,13 @@ struct SignatureValidation {`
`582`	`582`	`configuration: RegistryConfiguration.Security.Signing,`
`583`	`583`	`fileSystem: FileSystem`
`584`	`584`	`) async throws -> SigningEntity? {`
`585`		`- try await withCheckedThrowingContinuation {`
	`585`	`+ try await withCheckedThrowingContinuation { continuation in`
`586`	`586`	`SignatureValidation.extractSigningEntity(`
`587`	`587`	`signature: signature,`
`588`	`588`	`signatureFormat: signatureFormat,`
`589`	`589`	`configuration: configuration,`
`590`	`590`	`fileSystem: fileSystem,`
`591`		`- completion: $0.resume(with:)`
	`591`	`+ completion: { continuation.resume(with: $0) }`
`592`	`592`	`)`
`593`	`593`	`}`
`594`	`594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,15 @@ struct PackageSigningEntityTOFU {`
`39`	`39`	`observabilityScope: ObservabilityScope,`
`40`	`40`	`callbackQueue: DispatchQueue`
`41`	`41`	`) async throws {`
`42`		`- try await withCheckedThrowingContinuation {`
	`42`	`+ try await withCheckedThrowingContinuation { continuation in`
`43`	`43`	`self.validate(`
`44`	`44`	`registry: registry,`
`45`	`45`	`package: package,`
`46`	`46`	`version: version,`
`47`	`47`	`signingEntity: signingEntity,`
`48`	`48`	`observabilityScope: observabilityScope,`
`49`	`49`	`callbackQueue: callbackQueue,`
`50`		`- completion: $0.resume(with:)`
	`50`	`+ completion: { continuation.resume(with: $0) }`
`51`	`51`	`)`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,15 @@ public class RepositoryManager: Cancellable {`
`99`	`99`	`delegateQueue: DispatchQueue,`
`100`	`100`	`callbackQueue: DispatchQueue`
`101`	`101`	`) async throws -> RepositoryHandle {`
`102`		`- try await withCheckedThrowingContinuation {`
	`102`	`+ try await withCheckedThrowingContinuation { continuation in`
`103`	`103`	`self.lookup(`
`104`	`104`	`package: package,`
`105`	`105`	`repository: repository,`
`106`	`106`	`updateStrategy: updateStrategy,`
`107`	`107`	`observabilityScope: observabilityScope,`
`108`	`108`	`delegateQueue: delegateQueue,`
`109`	`109`	`callbackQueue: callbackQueue,`
`110`		`- completion: $0.resume(with:)`
	`110`	`+ completion: { continuation.resume(with: $0) }`
`111`	`111`	`)`
`112`	`112`	`}`
`113`	`113`	`}`