Merge branch 'main' into #189-macos-host-toolchain-default

Author: xtremekforever

.swift-format

@@ -9,7 +9,7 @@
   },
   "lineBreakAroundMultilineExpressionChainComponents" : false,
   "lineBreakBeforeControlFlowKeywords" : false,
-  "lineBreakBeforeEachArgument" : false,
+  "lineBreakBeforeEachArgument" : true,
   "lineBreakBeforeEachGenericRequirement" : false,
   "lineLength" : 100,
   "maximumBlankLines" : 1,

README.md

@@ -87,7 +87,7 @@ subsequently as `<generated_sdk_id>`.
 Create a new project to verify that the SDK works:
 
 ```
-mkdir cross-compilation test
+mkdir cross-compilation-test
 cd cross-compilation-test
 swift package init --type executable
 ```

Sources/AsyncProcess/FileContentStream.swift

@@ -256,7 +256,9 @@ private final class ReadIntoAsyncChannelHandler: ChannelDuplexHandler {
 extension FileHandle {
   func fileContentStream(eventLoop: EventLoop) throws -> FileContentStream {
     let asyncBytes = try FileContentStream(
-      fileDescriptor: self.fileDescriptor, eventLoop: eventLoop)
+      fileDescriptor: self.fileDescriptor,
+      eventLoop: eventLoop
+    )
     try self.close()
     return asyncBytes
   }
@@ -432,7 +434,8 @@ where Base: AsyncSequence, Base.Element == ByteBuffer {
   }
 
   public init(
-    _ underlying: Base, dropTerminator: Bool,
+    _ underlying: Base,
+    dropTerminator: Bool,
     maximumAllowableBufferSize: Int,
     dropLastChunkIfNoNewline: Bool
   ) {

Sources/AsyncProcess/ProcessExecutor+Convenience.swift

@@ -324,7 +324,10 @@ extension ProcessExecutor {
       }
 
       var allInfo = ProcessExitReasonAndOutput(
-        exitReason: .exit(-1), standardOutput: nil, standardError: nil)
+        exitReason: .exit(-1),
+        standardOutput: nil,
+        standardError: nil
+      )
       while let next = try await group.next() {
         switch next {
         case let .exitReason(exitReason):
@@ -467,7 +470,8 @@ extension ProcessExecutor {
     try await self.runCollectingOutput(
       group: group,
       executable: executable,
-      arguments, standardInput: EOFSequence(),
+      arguments,
+      standardInput: EOFSequence(),
       collectStandardOutput: collectStandardOutput,
       collectStandardError: collectStandardError,
       perStreamCollectionLimitBytes: perStreamCollectionLimitBytes,

Sources/AsyncProcess/ProcessExecutor.swift

@@ -159,7 +159,8 @@ public final actor ProcessExecutor {
   private let _standardOutput: ChunkSequence
   private let _standardError: ChunkSequence
   private let processIsRunningApproximation = ManagedAtomic(
-    RunningStateApproximation.neverStarted.rawValue)
+    RunningStateApproximation.neverStarted.rawValue
+  )
   private let processOutputConsumptionApproximation = ManagedAtomic(UInt8(0))
   private let processPid = ManagedAtomic(pid_t(0))
   private let ownsStandardOutputWriteHandle: Bool
@@ -568,7 +569,10 @@ public final actor ProcessExecutor {
     // At this point, the process is running, we should therefore have a process ID (unless we're already dead).
     let childPid = p.processIdentifier
     _ = self.processPid.compareExchange(
-      expected: 0, desired: childPid, ordering: .sequentiallyConsistent)
+      expected: 0,
+      desired: childPid,
+      ordering: .sequentiallyConsistent
+    )
     assert(childPid != 0 || !p.isRunning)
     self.logger.debug(
       "running command",

Sources/GeneratorCLI/GeneratorCLI.swift

@@ -71,7 +71,8 @@ struct GeneratorCLI: AsyncParsableCommand {
 
     logger.info(
       "Generator run finished successfully.",
-      metadata: ["elapsedTime": .string(elapsed.intervalString)])
+      metadata: ["elapsedTime": .string(elapsed.intervalString)]
+    )
   }
 }
 
@@ -181,7 +182,8 @@ extension GeneratorCLI {
       if let arch = hostArch {
         let target = Triple(arch: arch, vendor: current.vendor!, os: current.os!)
         appLogger.warning(
-          "deprecated: Please use `--host \(target.triple)` instead of `--host-arch \(arch)`")
+          "deprecated: Please use `--host \(target.triple)` instead of `--host-arch \(arch)`"
+        )
         return target
       }
       return current
@@ -256,7 +258,9 @@ extension GeneratorCLI {
       let distributionVersion =
         self.distributionVersion ?? distributionDefaultVersion
       let linuxDistribution = try LinuxDistribution(
-        name: distributionName, version: distributionVersion)
+        name: distributionName,
+        version: distributionVersion
+      )
       let hostTriple = try self.generatorOptions.deriveHostTriple()
       let targetTriple = self.deriveTargetTriple(hostTriple: hostTriple)
 
@@ -275,7 +279,10 @@ extension GeneratorCLI {
         logger: loggerWithLevel(from: self.generatorOptions)
       )
       try await GeneratorCLI.run(
-        recipe: recipe, targetTriple: targetTriple, options: self.generatorOptions)
+        recipe: recipe,
+        targetTriple: targetTriple,
+        options: self.generatorOptions
+      )
     }
 
     func isInvokedAsDefaultSubcommand() -> Bool {
@@ -332,7 +339,10 @@ extension GeneratorCLI {
       )
       let targetTriple = self.deriveTargetTriple()
       try await GeneratorCLI.run(
-        recipe: recipe, targetTriple: targetTriple, options: self.generatorOptions)
+        recipe: recipe,
+        targetTriple: targetTriple,
+        options: self.generatorOptions
+      )
     }
   }
 }
@@ -343,12 +353,19 @@ extension Duration {
     let date = Date(timeInterval: TimeInterval(self.components.seconds), since: reference)
 
     let components = Calendar.current.dateComponents(
-      [.hour, .minute, .second], from: reference, to: date)
+      [.hour, .minute, .second],
+      from: reference,
+      to: date
+    )
 
     if let hours = components.hour, hours > 0 {
       #if !canImport(Darwin) && compiler(<6.0)
         return String(
-          format: "%02d:%02d:%02d", hours, components.minute ?? 0, components.second ?? 0)
+          format: "%02d:%02d:%02d",
+          hours,
+          components.minute ?? 0,
+          components.second ?? 0
+        )
       #else
         return self.formatted()
       #endif

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Copy.swift

@@ -136,7 +136,8 @@ extension SwiftSDKGenerator {
       if isOptional && !doesFileExist(at: fromPath) {
         logger.debug(
           "Optional package path ignored since it does not exist",
-          metadata: ["packagePath": .string(fromPath.string)])
+          metadata: ["packagePath": .string(fromPath.string)]
+        )
         continue
       }
 

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Download.swift

@@ -31,7 +31,8 @@ extension FilePath {
 
 extension SwiftSDKGenerator {
   func downloadArtifacts(
-    _ client: some HTTPClientProtocol, _ engine: QueryEngine,
+    _ client: some HTTPClientProtocol,
+    _ engine: QueryEngine,
     downloadableArtifacts: inout DownloadableArtifacts,
     itemsToDownload: @Sendable (DownloadableArtifacts) -> [DownloadableArtifacts.Item]
   ) async throws {
@@ -58,7 +59,8 @@ extension SwiftSDKGenerator {
       for item in itemsToDownload(downloadableArtifacts) {
         group.addTask {
           try await engine[
-            DownloadArtifactQuery(artifact: item, httpClient: client, logger: self.logger)]
+            DownloadArtifactQuery(artifact: item, httpClient: client, logger: self.logger)
+          ]
         }
       }
 
@@ -74,7 +76,8 @@ extension SwiftSDKGenerator {
       "Using downloaded artifacts in these locations.",
       metadata: [
         "paths": .array(results.map(\.path.metadataValue))
-      ])
+      ]
+    )
   }
 
   func downloadUbuntuPackages(
@@ -93,7 +96,8 @@ extension SwiftSDKGenerator {
         """
         The `xz` utility was not found in `PATH`. \
         Consider installing it for more efficient downloading of package lists.
-        """)
+        """
+      )
     }
 
     async let mainPackages = try await client.parseUbuntuPackagesList(
@@ -137,7 +141,9 @@ extension SwiftSDKGenerator {
     }
 
     logger.info(
-      "Downloading Ubuntu packages...", metadata: ["packageCount": .stringConvertible(urls.count)])
+      "Downloading Ubuntu packages...",
+      metadata: ["packageCount": .stringConvertible(urls.count)]
+    )
     try await inTemporaryDirectory { fs, tmpDir in
       let downloadedFiles = try await self.downloadFiles(from: urls, to: tmpDir, client, engine)
       await report(downloadedFiles: downloadedFiles)
@@ -160,8 +166,11 @@ extension SwiftSDKGenerator {
         $0.addTask {
           let downloadedFilePath = try await engine[
             DownloadFileQuery(
-              remoteURL: url, localDirectory: directory, httpClient: client
-            )]
+              remoteURL: url,
+              localDirectory: directory,
+              httpClient: client
+            )
+          ]
           let filePath = downloadedFilePath.path
           guard
             let fileSize = try FileManager.default.attributesOfItem(
@@ -191,7 +200,8 @@ extension SwiftSDKGenerator {
         metadata: [
           "url": .string(url.absoluteString),
           "size": .string(byteCountFormatter.string(fromByteCount: Int64(bytes))),
-        ])
+        ]
+      )
     }
   }
 }

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Entrypoint.swift

@@ -51,7 +51,10 @@ extension SwiftSDKGenerator {
         try await self.createDirectoryIfNeeded(at: pathsConfiguration.artifactsCachePath)
 
         let swiftSDKProduct = try await recipe.makeSwiftSDK(
-          generator: self, engine: engine, httpClient: client)
+          generator: self,
+          engine: engine,
+          httpClient: client
+        )
 
         let toolsetJSONPath = try await self.generateToolsetJSON(recipe: recipe)
 

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Fixup.swift

@@ -58,7 +58,8 @@ extension SwiftSDKGenerator {
 
   func symlinkClangHeaders() throws {
     let swiftStaticClangPath = self.pathsConfiguration.toolchainDirPath.appending(
-      "usr/lib/swift_static/clang")
+      "usr/lib/swift_static/clang"
+    )
     if !doesFileExist(at: swiftStaticClangPath) {
       logger.info("Symlinking clang headers...")
       try self.createSymlink(