Skip to content

Commit 7236a5a

Browse files
committed
don't pass driver to generateExplicitModuleDependenciesBuildJobs
1 parent d2fefb4 commit 7236a5a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,23 +152,23 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
152152
/// module's target version (PCM Args).
153153
/// 2. Generate jobs for all Clang modules, now that we have each module's set of PCM versions it must be
154154
/// built against.
155-
public mutating func generateExplicitModuleDependenciesBuildJobs(driver: Driver) throws -> [Job] {
155+
public mutating func generateExplicitModuleDependenciesBuildJobs() throws -> [Job] {
156156
let mainModuleId: ModuleDependencyId = .swift(dependencyGraph.mainModuleName)
157157
guard let mainModuleDependencies = reachabilityMap[mainModuleId] else {
158158
fatalError("Expected reachability information for the main module.")
159159
}
160160
let swiftDependenciesJobs =
161-
try generateSwiftDependenciesBuildJobs(for: mainModuleDependencies, driver: driver)
161+
try generateSwiftDependenciesBuildJobs(for: mainModuleDependencies)
162162

163163
// Generate build jobs for all Clang modules
164164
let clangDependenciesJobs =
165-
try generateClangDependenciesBuildJobs(for: mainModuleDependencies, driver: driver)
165+
try generateClangDependenciesBuildJobs(for: mainModuleDependencies)
166166

167167
return swiftDependenciesJobs + clangDependenciesJobs
168168
}
169169

170170
/// Generate a build job for each Swift module in the set of supplied `dependencies`
171-
private mutating func generateSwiftDependenciesBuildJobs(for dependencies: Set<ModuleDependencyId>, driver: Driver)
171+
private mutating func generateSwiftDependenciesBuildJobs(for dependencies: Set<ModuleDependencyId>)
172172
throws -> [Job] {
173173
var jobs: [Job] = []
174174
let swiftDependencies = dependencies.filter {
@@ -245,7 +245,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
245245
}
246246

247247
/// Generate a build job for each Clang module in the set of supplied `dependencies`.
248-
private mutating func generateClangDependenciesBuildJobs(for dependencies: Set<ModuleDependencyId>, driver: Driver)
248+
private mutating func generateClangDependenciesBuildJobs(for dependencies: Set<ModuleDependencyId>)
249249
throws -> [Job] {
250250
var jobs: [Job] = []
251251
let clangDependencies = dependencies.filter {

Sources/SwiftDriver/Jobs/Planning.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ extension Driver {
226226
guard var resolvedModulePlanner = explicitModulePlanner else {
227227
return
228228
}
229-
let modulePrebuildJobs = try resolvedModulePlanner.generateExplicitModuleDependenciesBuildJobs(driver: self)
229+
let modulePrebuildJobs = try resolvedModulePlanner.generateExplicitModuleDependenciesBuildJobs()
230230
// If asked, add jobs to precompile module dependencies. Otherwise exit.
231231
// We may have a dependency graph but not be required to add pre-compile jobs to the build plan,
232232
// for example when `-explain-dependency` is being used.

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
177177
toolchain: driver.toolchain,
178178
supportsScannerPrefixMapPaths: driver.isFrontendArgSupported(.scannerPrefixMapPaths))
179179
let modulePrebuildJobs =
180-
try explicitDependencyBuildPlanner.generateExplicitModuleDependenciesBuildJobs(driver: driver)
180+
try explicitDependencyBuildPlanner.generateExplicitModuleDependenciesBuildJobs()
181181
XCTAssertEqual(modulePrebuildJobs.count, 4)
182182
for job in modulePrebuildJobs {
183183
XCTAssertEqual(job.outputs.count, 1)

0 commit comments

Comments
 (0)