Skip to content

Commit cc13858

Browse files
committed
Address formatting checks
1 parent 5f87752 commit cc13858

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

Sources/Helpers/Vendor/QueryEngine/CacheKey.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,3 @@ extension Array: CacheKey where Element == FilePath.Component {
182182
map(\.string).joined(separator: "\n").hash(with: &hashFunction)
183183
}
184184
}
185-

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Metadata.swift

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ extension SwiftSDKGenerator {
2424
func generateToolsetJSON(recipe: SwiftSDKRecipe, isForEmbeddedSwift: Bool = false) throws -> FilePath {
2525
logger.info("Generating toolset JSON file...")
2626

27-
let toolsetJSONPath = pathsConfiguration.swiftSDKRootPath.appending("\(isForEmbeddedSwift ? "embedded-" : "")toolset.json")
27+
let toolsetJSONPath = pathsConfiguration.swiftSDKRootPath.appending(
28+
"\(isForEmbeddedSwift ? "embedded-" : "")toolset.json"
29+
)
2830

2931
var relativeToolchainBinDir = pathsConfiguration.toolchainBinDirPath
3032

@@ -37,7 +39,11 @@ extension SwiftSDKGenerator {
3739
}
3840

3941
var toolset = Toolset(rootPath: relativeToolchainBinDir.string)
40-
recipe.applyPlatformOptions(toolset: &toolset, targetTriple: self.targetTriple, isForEmbeddedSwift: isForEmbeddedSwift)
42+
recipe.applyPlatformOptions(
43+
toolset: &toolset,
44+
targetTriple: self.targetTriple,
45+
isForEmbeddedSwift: isForEmbeddedSwift
46+
)
4147
try writeFile(at: toolsetJSONPath, encoder.encode(toolset))
4248

4349
return toolsetJSONPath
@@ -51,7 +57,9 @@ extension SwiftSDKGenerator {
5157
) throws -> FilePath {
5258
logger.info("Generating Swift SDK metadata JSON file...")
5359

54-
let destinationJSONPath = pathsConfiguration.swiftSDKRootPath.appending("\(isForEmbeddedSwift ? "embedded-" : "")swift-sdk.json")
60+
let destinationJSONPath = pathsConfiguration.swiftSDKRootPath.appending(
61+
"\(isForEmbeddedSwift ? "embedded-" : "")swift-sdk.json"
62+
)
5563

5664
var relativeToolchainBinDir = pathsConfiguration.toolchainBinDirPath
5765
var relativeSDKDir = sdkDirPath

Sources/SwiftSDKGenerator/SwiftSDKRecipes/LinuxRecipe.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ package struct LinuxRecipe: SwiftSDKRecipe {
157157
fatalError("The SDK directory path must be a subdirectory of the Swift SDK root path.")
158158
}
159159
metadata.targetTriples[targetTriple.triple]?.swiftResourcesPath = relativeSDKDir.appending("usr/lib/swift").string
160-
metadata.targetTriples[targetTriple.triple]?.swiftStaticResourcesPath = relativeSDKDir.appending("usr/lib/swift_static").string
160+
metadata.targetTriples[targetTriple.triple]?.swiftStaticResourcesPath =
161+
relativeSDKDir.appending("usr/lib/swift_static").string
161162
}
162163

163164
package var defaultArtifactID: String {

Sources/SwiftSDKGenerator/SwiftSDKRecipes/WebAssemblyRecipe.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ package struct WebAssemblyRecipe: SwiftSDKRecipe {
120120
var tripleProperties = metadata.targetTriples[targetTriple.triple]!
121121
tripleProperties.swiftStaticResourcesPath =
122122
relativeToolchainDir.appending("usr/lib/swift_static").string
123-
tripleProperties.swiftResourcesPath = isForEmbeddedSwift
123+
tripleProperties.swiftResourcesPath =
124+
isForEmbeddedSwift
124125
? relativeToolchainDir.appending("usr/lib/swift").string
125126
: tripleProperties.swiftStaticResourcesPath
126127

0 commit comments

Comments
 (0)