Skip to content

Commit 2626ccd

Browse files
authored
Fix typos and warnings in SwiftDriver module and its tests (#1461)
`experimentalFeatures` -> `experimentalFeatures`. Also fixed uses of deprecated `RelativePath` initializer.
1 parent 376a516 commit 2626ccd

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Sources/SwiftDriver/Jobs/CompileJob.swift

-2
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,6 @@ extension Driver {
363363
commandLine.appendFlag(map)
364364
}
365365

366-
let expirementalFeatures = parsedOptions.arguments(for: .enableExperimentalFeature)
367-
368366
try commandLine.appendLast(.trackSystemDependencies, from: &parsedOptions)
369367
try commandLine.appendLast(.CrossModuleOptimization, from: &parsedOptions)
370368
try commandLine.appendLast(.ExperimentalPerformanceAnnotations, from: &parsedOptions)

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ extension Driver {
107107
commandLine.appendFlag("-aarch64-use-tbi")
108108
}
109109

110-
let expirementalFeatures = parsedOptions.arguments(for: .enableExperimentalFeature)
111-
let embeddedEnabled = expirementalFeatures.map(\.argument).map(\.asSingle).contains("Embedded")
110+
let experimentalFeatures = parsedOptions.arguments(for: .enableExperimentalFeature)
111+
let embeddedEnabled = experimentalFeatures.map(\.argument).map(\.asSingle).contains("Embedded")
112112

113113
// Enable or disable ObjC interop appropriately for the platform
114114
if targetTriple.isDarwin && !embeddedEnabled {

Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ extension DarwinToolchain {
117117
}
118118
}
119119

120-
let expirementalFeatures = parsedOptions.arguments(for: .enableExperimentalFeature)
121-
let embeddedEnabled = expirementalFeatures.map(\.argument).map(\.asSingle).contains("Embedded")
120+
let experimentalFeatures = parsedOptions.arguments(for: .enableExperimentalFeature)
121+
let embeddedEnabled = experimentalFeatures.map(\.argument).map(\.asSingle).contains("Embedded")
122122

123123
if !embeddedEnabled {
124124
for compatibilityLib in targetInfo.target.compatibilityLibraries {

Tests/SwiftDriverTests/CachingBuildTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ final class CachingBuildTests: XCTestCase {
254254
}
255255
} else {
256256
switch (outputFilePath) {
257-
case .relative(RelativePath("testCachingBuildJobs")):
257+
case .relative(try RelativePath(validating: "testCachingBuildJobs")):
258258
XCTAssertTrue(driver.isExplicitMainModuleJob(job: job))
259259
XCTAssertEqual(job.kind, .link)
260260
case .temporary(_):
@@ -399,7 +399,7 @@ final class CachingBuildTests: XCTestCase {
399399
}
400400
} else {
401401
switch (outputFilePath) {
402-
case .relative(RelativePath("testExplicitModuleVerifyInterfaceJobs")):
402+
case .relative(try RelativePath(validating: "testExplicitModuleVerifyInterfaceJobs")):
403403
XCTAssertTrue(driver.isExplicitMainModuleJob(job: job))
404404
XCTAssertEqual(job.kind, .link)
405405
case .temporary(_):

0 commit comments

Comments
 (0)