From c7f08e1c4bfa04cca235c2f9e7552fa3874f916a Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 11 Oct 2023 13:09:10 +0100 Subject: [PATCH] Fix typos and warnings in `SwiftDriver` module and its tests --- Sources/SwiftDriver/Jobs/CompileJob.swift | 2 -- Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift | 4 ++-- Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift | 4 ++-- Tests/SwiftDriverTests/CachingBuildTests.swift | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Sources/SwiftDriver/Jobs/CompileJob.swift b/Sources/SwiftDriver/Jobs/CompileJob.swift index cde5fdd2e..48763386a 100644 --- a/Sources/SwiftDriver/Jobs/CompileJob.swift +++ b/Sources/SwiftDriver/Jobs/CompileJob.swift @@ -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) diff --git a/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift b/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift index 9050e3f49..48c933b22 100644 --- a/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift +++ b/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift @@ -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 { diff --git a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift index 374fdd51a..0e54d1250 100644 --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift @@ -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 { diff --git a/Tests/SwiftDriverTests/CachingBuildTests.swift b/Tests/SwiftDriverTests/CachingBuildTests.swift index e55f9c457..0d5878def 100644 --- a/Tests/SwiftDriverTests/CachingBuildTests.swift +++ b/Tests/SwiftDriverTests/CachingBuildTests.swift @@ -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(_): @@ -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(_):