Merge branch 'main' into maxd/embedded-wasi

MaxDesiatov · web-flow · commit 5f877526ca31 · 2025-05-15T12:31:04.000+01:00
diff --git a/.swift-format b/.swift-format
@@ -11,7 +11,7 @@
   "lineBreakBeforeControlFlowKeywords" : false,
   "lineBreakBeforeEachArgument" : true,
   "lineBreakBeforeEachGenericRequirement" : false,
-  "lineLength" : 100,
+  "lineLength" : 120,
   "maximumBlankLines" : 1,
   "multiElementCollectionTrailingCommas" : true,
   "noAssignmentInExpressions" : {
diff --git a/Sources/SwiftSDKGenerator/SwiftSDKRecipes/WebAssemblyRecipe.swift b/Sources/SwiftSDKGenerator/SwiftSDKRecipes/WebAssemblyRecipe.swift
@@ -202,8 +202,7 @@ package struct WebAssemblyRecipe: SwiftSDKRecipe {
   }
 
   /// Merge the target Swift package into the Swift SDK bundle derived from the host Swift package.
-  func mergeTargetSwift(from distributionPath: FilePath, generator: SwiftSDKGenerator) async throws
-  {
+  func mergeTargetSwift(from distributionPath: FilePath, generator: SwiftSDKGenerator) async throws {
     let pathsConfiguration = generator.pathsConfiguration
     logger.info("Copying Swift core libraries for the target triple into Swift SDK bundle...")
     for (pathWithinPackage, pathWithinSwiftSDK, isOptional) in [

Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,7 @@ package struct WebAssemblyRecipe: SwiftSDKRecipe {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/// Merge the target Swift package into the Swift SDK bundle derived from the host Swift package.`
`205`		`- func mergeTargetSwift(from distributionPath: FilePath, generator: SwiftSDKGenerator) async throws`
`206`		`- {`
	`205`	`+ func mergeTargetSwift(from distributionPath: FilePath, generator: SwiftSDKGenerator) async throws {`
`207`	`206`	`let pathsConfiguration = generator.pathsConfiguration`
`208`	`207`	`logger.info("Copying Swift core libraries for the target triple into Swift SDK bundle...")`
`209`	`208`	`for (pathWithinPackage, pathWithinSwiftSDK, isOptional) in [`