Skip to content

Commit 58a4ca2

Browse files
jakepetroulesjakepetroules
committed
Give labels to the Toolchain constructor
This is some of the oldest code in the codebase, written to Swift 3 standards. Modernize it so it's more readable.
1 parent c4fcb34 commit 58a4ca2

File tree

6 files changed

+49
-19
lines changed

6 files changed

+49
-19
lines changed

‎Sources/SWBAndroidPlatform/Plugin.swift

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,21 @@ struct AndroidToolchainRegistryExtension: ToolchainRegistryExtension {
161161
return []
162162
}
163163

164-
return [Toolchain("android", "Android", Version(0, 0, 0), [], toolchainPath, [], [], [:], [:], [:], executableSearchPaths: [toolchainPath.join("bin")], testingLibraryPlatformNames: [], fs: context.fs)]
164+
return [
165+
Toolchain(
166+
identifier: "android",
167+
displayName: "Android",
168+
version: Version(0, 0, 0),
169+
aliases: [],
170+
path: toolchainPath,
171+
frameworkPaths: [],
172+
libraryPaths: [],
173+
defaultSettings: [:],
174+
overrideSettings: [:],
175+
defaultSettingsWhenPrimary: [:],
176+
executableSearchPaths: [toolchainPath.join("bin")],
177+
testingLibraryPlatformNames: [],
178+
fs: context.fs)
179+
]
165180
}
166181
}

‎Sources/SWBCore/ToolchainRegistry.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public final class Toolchain: Hashable, Sendable {
7474
/// The names of the platforms for which this toolchain contains testing libraries.
7575
public let testingLibraryPlatformNames: Set<String>
7676

77-
package init(_ identifier: String, _ displayName: String, _ version: Version, _ aliases: Set<String>, _ path: Path, _ frameworkPaths: [String], _ libraryPaths: [String], _ defaultSettings: [String: PropertyListItem], _ overrideSettings: [String: PropertyListItem], _ defaultSettingsWhenPrimary: [String: PropertyListItem], executableSearchPaths: [Path], testingLibraryPlatformNames: Set<String>, fs: any FSProxy) {
77+
package init(identifier: String, displayName: String, version: Version, aliases: Set<String>, path: Path, frameworkPaths: [String], libraryPaths: [String], defaultSettings: [String: PropertyListItem], overrideSettings: [String: PropertyListItem], defaultSettingsWhenPrimary: [String: PropertyListItem], executableSearchPaths: [Path], testingLibraryPlatformNames: Set<String>, fs: any FSProxy) {
7878
self.identifier = identifier
7979
self.version = version
8080

@@ -104,7 +104,7 @@ public final class Toolchain: Hashable, Sendable {
104104
self.testingLibraryPlatformNames = testingLibraryPlatformNames
105105
}
106106

107-
convenience init(_ path: Path, operatingSystem: OperatingSystem, fs: any FSProxy, pluginManager: PluginManager, platformRegistry: PlatformRegistry?) async throws {
107+
convenience init(path: Path, operatingSystem: OperatingSystem, fs: any FSProxy, pluginManager: PluginManager, platformRegistry: PlatformRegistry?) async throws {
108108
let data: PropertyListItem
109109

110110
do {
@@ -305,7 +305,7 @@ public final class Toolchain: Hashable, Sendable {
305305
}
306306

307307
// Construct the toolchain
308-
self.init(identifier, displayName, version, aliases, path, frameworkSearchPaths, librarySearchPaths, defaultSettings, overrideSettings, defaultSettingsWhenPrimary, executableSearchPaths: executableSearchPaths, testingLibraryPlatformNames: testingLibraryPlatformNames, fs: fs)
308+
self.init(identifier: identifier, displayName: displayName, version: version, aliases: aliases, path: path, frameworkPaths: frameworkSearchPaths, libraryPaths: librarySearchPaths, defaultSettings: defaultSettings, overrideSettings: overrideSettings, defaultSettingsWhenPrimary: defaultSettingsWhenPrimary, executableSearchPaths: executableSearchPaths, testingLibraryPlatformNames: testingLibraryPlatformNames, fs: fs)
309309
}
310310

311311
public func hash(into hasher: inout Hasher) {
@@ -474,7 +474,7 @@ public final class ToolchainRegistry: @unchecked Sendable {
474474
guard toolchainPath.basenameWithoutSuffix != "swift-latest" else { continue }
475475

476476
do {
477-
let toolchain = try await Toolchain(toolchainPath, operatingSystem: operatingSystem, fs: fs, pluginManager: delegate.pluginManager, platformRegistry: delegate.platformRegistry)
477+
let toolchain = try await Toolchain(path: toolchainPath, operatingSystem: operatingSystem, fs: fs, pluginManager: delegate.pluginManager, platformRegistry: delegate.platformRegistry)
478478
try register(toolchain)
479479
} catch let err {
480480
delegate.issue(strict: strict, toolchainPath, "failed to load toolchain: \(err)")

‎Sources/SWBGenericUnixPlatform/Plugin.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,16 @@ struct GenericUnixToolchainRegistryExtension: ToolchainRegistryExtension {
132132
let llvmDirectoriesLocal = try Array(fs.listdir(Path("/usr/local")).filter { $0.hasPrefix("llvm") }.sorted().reversed())
133133
return [
134134
Toolchain(
135-
ToolchainRegistry.defaultToolchainIdentifier,
136-
"Default",
137-
Version(),
138-
["default"],
139-
path,
140-
[],
141-
llvmDirectories.map { "/usr/lib/\($0)/lib" } + llvmDirectoriesLocal.map { "/usr/local/\($0)/lib" } + ["/usr/lib64"],
142-
[:],
143-
[:],
144-
[:],
135+
identifier: ToolchainRegistry.defaultToolchainIdentifier,
136+
displayName: "Default",
137+
version: Version(),
138+
aliases: ["default"],
139+
path: path,
140+
frameworkPaths: [],
141+
libraryPaths: llvmDirectories.map { "/usr/lib/\($0)/lib" } + llvmDirectoriesLocal.map { "/usr/local/\($0)/lib" } + ["/usr/lib64"],
142+
defaultSettings: [:],
143+
overrideSettings: [:],
144+
defaultSettingsWhenPrimary: [:],
145145
executableSearchPaths: realSwiftPath.dirname.relativeSubpath(from: path).map { [path.join($0).join("bin")] } ?? [],
146146
testingLibraryPlatformNames: [],
147147
fs: fs)

‎Sources/SWBQNXPlatform/Plugin.swift

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,21 @@ struct QNXToolchainRegistryExtension: ToolchainRegistryExtension {
146146
return []
147147
}
148148

149-
return [Toolchain("qnx", "QNX", Version(0, 0, 0), [], toolchainPath, [], [], [:], [:], [:], executableSearchPaths: [toolchainPath.join("usr").join("bin")], testingLibraryPlatformNames: [], fs: context.fs)]
149+
return [
150+
Toolchain(
151+
identifier: "qnx",
152+
displayName: "QNX",
153+
version: Version(0, 0, 0),
154+
aliases: [],
155+
path: toolchainPath,
156+
frameworkPaths: [],
157+
libraryPaths: [],
158+
defaultSettings: [:],
159+
overrideSettings: [:],
160+
defaultSettingsWhenPrimary: [:],
161+
executableSearchPaths: [toolchainPath.join("usr").join("bin")],
162+
testingLibraryPlatformNames: [],
163+
fs: context.fs)
164+
]
150165
}
151166
}

‎Tests/SWBCoreTests/CoreTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ import Foundation
386386
guard context.toolchainRegistry.lookup(ToolchainRegistry.defaultToolchainIdentifier) == nil else {
387387
return []
388388
}
389-
return [Toolchain(ToolchainRegistry.defaultToolchainIdentifier, "Mock", Version(), ["default"], .root, [], [], [:], [:], [:], executableSearchPaths: [], testingLibraryPlatformNames: [], fs: context.fs)]
389+
return [Toolchain(identifier: ToolchainRegistry.defaultToolchainIdentifier, displayName: "Mock", version: Version(), aliases: ["default"], path: .root, frameworkPaths: [], libraryPaths: [], defaultSettings: [:], overrideSettings: [:], defaultSettingsWhenPrimary: [:], executableSearchPaths: [], testingLibraryPlatformNames: [], fs: context.fs)]
390390
}
391391
}
392392
await pluginManager.register(MockToolchainExtension(), type: ToolchainRegistryExtensionPoint.self)
@@ -424,7 +424,7 @@ import Foundation
424424
guard context.toolchainRegistry.lookup(ToolchainRegistry.defaultToolchainIdentifier) == nil else {
425425
return []
426426
}
427-
return [Toolchain(ToolchainRegistry.defaultToolchainIdentifier, "Mock", Version(), ["default"], .root, [], [], [:], [:], [:], executableSearchPaths: [], testingLibraryPlatformNames: [], fs: context.fs)]
427+
return [Toolchain(identifier: ToolchainRegistry.defaultToolchainIdentifier, displayName: "Mock", version: Version(), aliases: ["default"], path: .root, frameworkPaths: [], libraryPaths: [], defaultSettings: [:], overrideSettings: [:], defaultSettingsWhenPrimary: [:], executableSearchPaths: [], testingLibraryPlatformNames: [], fs: context.fs)]
428428
}
429429
}
430430
await pluginManager.register(MockToolchainExtension(), type: ToolchainRegistryExtensionPoint.self)

‎Tests/SWBCoreTests/ToolchainRegistryTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import SWBUtil
7878
guard context.toolchainRegistry.lookup(ToolchainRegistry.defaultToolchainIdentifier) == nil else {
7979
return []
8080
}
81-
return [Toolchain(ToolchainRegistry.defaultToolchainIdentifier, "Mock", Version(), ["default"], .root, [], [], [:], [:], [:], executableSearchPaths: [], testingLibraryPlatformNames: [], fs: context.fs)]
81+
return [Toolchain(identifier: ToolchainRegistry.defaultToolchainIdentifier, displayName: "Mock", version: Version(), aliases: ["default"], path: .root, frameworkPaths: [], libraryPaths: [], defaultSettings: [:], overrideSettings: [:], defaultSettingsWhenPrimary: [:], executableSearchPaths: [], testingLibraryPlatformNames: [], fs: context.fs)]
8282
}
8383
}
8484
await pluginManager.register(MockToolchainExtension(), type: ToolchainRegistryExtensionPoint.self)

0 commit comments

Comments
 (0)