From 46f6d86e8a3bd16ab889942f9f150a1677364554 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Tue, 9 Apr 2024 18:34:31 +0100 Subject: [PATCH] Fix `@Sendable @escaping` order, symbol name typo Sticking to `@escaping @Sendable` as a preferred order of attributes. Also fixed `dependecies` -> `dependencies` typo. --- .../Basics/Concurrency/ConcurrencyHelpers.swift | 2 +- Sources/Basics/FileSystem/TemporaryFile.swift | 2 +- Sources/Basics/Observability.swift | 3 +-- Sources/CoreCommands/BuildSystemSupport.swift | 2 +- Sources/CoreCommands/SwiftCommandState.swift | 2 +- Sources/PackageRegistry/SignatureValidation.swift | 14 +++++++------- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Sources/Basics/Concurrency/ConcurrencyHelpers.swift b/Sources/Basics/Concurrency/ConcurrencyHelpers.swift index 24330b3e79f..3a10d61a81c 100644 --- a/Sources/Basics/Concurrency/ConcurrencyHelpers.swift +++ b/Sources/Basics/Concurrency/ConcurrencyHelpers.swift @@ -49,7 +49,7 @@ extension DispatchQueue { /// Bridges between potentially blocking methods that take a result completion closure and async/await public func safe_async( - _ body: @Sendable @escaping (@Sendable @escaping (Result) -> Void) -> Void + _ body: @escaping @Sendable (@escaping @Sendable (Result) -> Void) -> Void ) async throws -> T { try await withCheckedThrowingContinuation { continuation in // It is possible that body make block indefinitely on a lock, semaphore, diff --git a/Sources/Basics/FileSystem/TemporaryFile.swift b/Sources/Basics/FileSystem/TemporaryFile.swift index a8e31126448..756f5022f4a 100644 --- a/Sources/Basics/FileSystem/TemporaryFile.swift +++ b/Sources/Basics/FileSystem/TemporaryFile.swift @@ -34,7 +34,7 @@ public func withTemporaryDirectory( fileSystem: FileSystem = localFileSystem, dir: AbsolutePath? = nil, prefix: String = "TemporaryDirectory", - _ body: @Sendable @escaping (AbsolutePath, @escaping (AbsolutePath) -> Void) async throws -> Result + _ body: @escaping @Sendable (AbsolutePath, @escaping (AbsolutePath) -> Void) async throws -> Result ) throws -> Task { let temporaryDirectory = try createTemporaryDirectory(fileSystem: fileSystem, dir: dir, prefix: prefix) diff --git a/Sources/Basics/Observability.swift b/Sources/Basics/Observability.swift index 4d6e01f959b..2567c6be7ec 100644 --- a/Sources/Basics/Observability.swift +++ b/Sources/Basics/Observability.swift @@ -46,8 +46,7 @@ public class ObservabilitySystem { private struct SingleDiagnosticsHandler: ObservabilityHandlerProvider, DiagnosticsHandler { var diagnosticsHandler: DiagnosticsHandler { self } - let underlying: @Sendable (ObservabilityScope, Diagnostic) - -> Void + let underlying: @Sendable (ObservabilityScope, Diagnostic) -> Void init(_ underlying: @escaping @Sendable (ObservabilityScope, Diagnostic) -> Void) { self.underlying = underlying diff --git a/Sources/CoreCommands/BuildSystemSupport.swift b/Sources/CoreCommands/BuildSystemSupport.swift index da932c387af..c2e7bd0c4c2 100644 --- a/Sources/CoreCommands/BuildSystemSupport.swift +++ b/Sources/CoreCommands/BuildSystemSupport.swift @@ -53,7 +53,7 @@ private struct NativeBuildSystemFactory: BuildSystemFactory { ), additionalFileRules: FileRuleDescription.swiftpmFileTypes, pkgConfigDirectories: self.swiftCommandState.options.locations.pkgConfigDirectories, - dependenciesByRootPackageIdentity: rootPackageInfo.dependecies, + dependenciesByRootPackageIdentity: rootPackageInfo.dependencies, targetsByRootPackageIdentity: rootPackageInfo.targets, outputStream: outputStream ?? self.swiftCommandState.outputStream, logLevel: logLevel ?? self.swiftCommandState.logLevel, diff --git a/Sources/CoreCommands/SwiftCommandState.swift b/Sources/CoreCommands/SwiftCommandState.swift index 38c190ec386..754a5401ea4 100644 --- a/Sources/CoreCommands/SwiftCommandState.swift +++ b/Sources/CoreCommands/SwiftCommandState.swift @@ -463,7 +463,7 @@ package final class SwiftCommandState { return workspace } - package func getRootPackageInformation() throws -> (dependecies: [PackageIdentity: [PackageIdentity]], targets: [PackageIdentity: [String]]) { + package func getRootPackageInformation() throws -> (dependencies: [PackageIdentity: [PackageIdentity]], targets: [PackageIdentity: [String]]) { let workspace = try self.getActiveWorkspace() let root = try self.getWorkspaceRoot() let rootManifests = try temp_await { diff --git a/Sources/PackageRegistry/SignatureValidation.swift b/Sources/PackageRegistry/SignatureValidation.swift index 3e5fccd64ae..4fee446f87f 100644 --- a/Sources/PackageRegistry/SignatureValidation.swift +++ b/Sources/PackageRegistry/SignatureValidation.swift @@ -91,7 +91,7 @@ struct SignatureValidation { fileSystem: FileSystem, observabilityScope: ObservabilityScope, callbackQueue: DispatchQueue, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { guard !self.skipSignatureValidation else { return completion(.success(.none)) @@ -138,7 +138,7 @@ struct SignatureValidation { fileSystem: FileSystem, observabilityScope: ObservabilityScope, callbackQueue: DispatchQueue, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { do { let versionMetadata = try self.versionMetadataProvider(package, version) @@ -240,7 +240,7 @@ struct SignatureValidation { configuration: RegistryConfiguration.Security.Signing, fileSystem: FileSystem, observabilityScope: ObservabilityScope, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { Task { do { @@ -353,7 +353,7 @@ struct SignatureValidation { fileSystem: FileSystem, observabilityScope: ObservabilityScope, callbackQueue: DispatchQueue, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { guard !self.skipSignatureValidation else { return completion(.success(.none)) @@ -402,7 +402,7 @@ struct SignatureValidation { fileSystem: FileSystem, observabilityScope: ObservabilityScope, callbackQueue: DispatchQueue, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { let manifestName = toolsVersion.map { "Package@swift-\($0).swift" } ?? Manifest.filename @@ -506,7 +506,7 @@ struct SignatureValidation { configuration: RegistryConfiguration.Security.Signing, fileSystem: FileSystem, observabilityScope: ObservabilityScope, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { Task { do { @@ -577,7 +577,7 @@ struct SignatureValidation { signatureFormat: SignatureFormat, configuration: RegistryConfiguration.Security.Signing, fileSystem: FileSystem, - completion: @Sendable @escaping (Result) -> Void + completion: @escaping @Sendable (Result) -> Void ) { Task { do {