Skip to content

Commit babe1d8

Browse files
committed
Code cleanup according to code-review feedback
1 parent bbd2ab8 commit babe1d8

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Sources/SwiftDriver/Explicit Module Builds/PlaceholderDependencyResolution.swift

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ import Foundation
6969
while !placeholderModules.isEmpty {
7070
let moduleId = placeholderModules.first!
7171
let swiftModuleId = ModuleDependencyId.swift(moduleId.moduleName)
72-
73-
guard dependencyOracle.getModuleInfo(of: swiftModuleId) != nil else {
72+
guard let moduleInfo = dependencyOracle.getModuleInfo(of: swiftModuleId) else {
7473
throw Driver.Error.missingExternalDependency(moduleId.moduleName)
7574
}
76-
let moduleInfo = dependencyOracle.getModuleInfo(of: swiftModuleId)!
7775

7876
// Insert the resolved module, replacing the placeholder.
7977
try Self.mergeModule(swiftModuleId, moduleInfo, into: &modules)
@@ -117,17 +115,18 @@ fileprivate extension InterModuleDependencyGraph {
117115
// in the multi-module build planning context.
118116
let swiftModuleId = ModuleDependencyId.swift(placeholderId.moduleName)
119117
let swiftPrebuiltModuleId = ModuleDependencyId.swiftPrebuiltExternal(placeholderId.moduleName)
120-
121118
let externalModuleId: ModuleDependencyId
122-
if dependencyOracle.getModuleInfo(of: swiftModuleId) != nil {
119+
let externalModuleInfo: ModuleInfo
120+
if let moduleInfo = dependencyOracle.getModuleInfo(of: swiftModuleId) {
123121
externalModuleId = swiftModuleId
124-
} else if dependencyOracle.getModuleInfo(of: swiftPrebuiltModuleId) != nil {
122+
externalModuleInfo = moduleInfo
123+
} else if let prebuiltModuleInfo = dependencyOracle.getModuleInfo(of: swiftPrebuiltModuleId) {
125124
externalModuleId = swiftPrebuiltModuleId
125+
externalModuleInfo = prebuiltModuleInfo
126126
} else {
127127
throw Driver.Error.missingExternalDependency(placeholderId.moduleName)
128128
}
129129

130-
let externalModuleInfo = dependencyOracle.getModuleInfo(of: externalModuleId)!
131130
let newExternalModuleDetails =
132131
SwiftPrebuiltExternalModuleDetails(compiledModulePath: placeholderPath.description)
133132
let newInfo = ModuleInfo(modulePath: placeholderPath.description,

0 commit comments

Comments
 (0)