Skip to content

Fix typos and warnings in SwiftDriver module and its tests #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Fix typos and warnings in SwiftDriver module and its tests #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Sources/SwiftDriver/Jobs/CompileJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,6 @@ extension Driver {
commandLine.appendFlag(map)
}

let expirementalFeatures = parsedOptions.arguments(for: .enableExperimentalFeature)

try commandLine.appendLast(.trackSystemDependencies, from: &parsedOptions)
try commandLine.appendLast(.CrossModuleOptimization, from: &parsedOptions)
try commandLine.appendLast(.ExperimentalPerformanceAnnotations, from: &parsedOptions)
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ extension Driver {
commandLine.appendFlag("-aarch64-use-tbi")
}

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

// Enable or disable ObjC interop appropriately for the platform
if targetTriple.isDarwin && !embeddedEnabled {
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ extension DarwinToolchain {
}
}

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

if !embeddedEnabled {
for compatibilityLib in targetInfo.target.compatibilityLibraries {
Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftDriverTests/CachingBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ final class CachingBuildTests: XCTestCase {
}
} else {
switch (outputFilePath) {
case .relative(RelativePath("testCachingBuildJobs")):
case .relative(try RelativePath(validating: "testCachingBuildJobs")):
XCTAssertTrue(driver.isExplicitMainModuleJob(job: job))
XCTAssertEqual(job.kind, .link)
case .temporary(_):
Expand Down Expand Up @@ -399,7 +399,7 @@ final class CachingBuildTests: XCTestCase {
}
} else {
switch (outputFilePath) {
case .relative(RelativePath("testExplicitModuleVerifyInterfaceJobs")):
case .relative(try RelativePath(validating: "testExplicitModuleVerifyInterfaceJobs")):
XCTAssertTrue(driver.isExplicitMainModuleJob(job: job))
XCTAssertEqual(job.kind, .link)
case .temporary(_):
Expand Down