@@ -69,11 +69,9 @@ import Foundation
69
69
while !placeholderModules. isEmpty {
70
70
let moduleId = placeholderModules. first!
71
71
let swiftModuleId = ModuleDependencyId . swift ( moduleId. moduleName)
72
-
73
- guard dependencyOracle. getModuleInfo ( of: swiftModuleId) != nil else {
72
+ guard let moduleInfo = dependencyOracle. getModuleInfo ( of: swiftModuleId) else {
74
73
throw Driver . Error. missingExternalDependency ( moduleId. moduleName)
75
74
}
76
- let moduleInfo = dependencyOracle. getModuleInfo ( of: swiftModuleId) !
77
75
78
76
// Insert the resolved module, replacing the placeholder.
79
77
try Self . mergeModule ( swiftModuleId, moduleInfo, into: & modules)
@@ -117,17 +115,18 @@ fileprivate extension InterModuleDependencyGraph {
117
115
// in the multi-module build planning context.
118
116
let swiftModuleId = ModuleDependencyId . swift ( placeholderId. moduleName)
119
117
let swiftPrebuiltModuleId = ModuleDependencyId . swiftPrebuiltExternal ( placeholderId. moduleName)
120
-
121
118
let externalModuleId : ModuleDependencyId
122
- if dependencyOracle. getModuleInfo ( of: swiftModuleId) != nil {
119
+ let externalModuleInfo : ModuleInfo
120
+ if let moduleInfo = dependencyOracle. getModuleInfo ( of: swiftModuleId) {
123
121
externalModuleId = swiftModuleId
124
- } else if dependencyOracle. getModuleInfo ( of: swiftPrebuiltModuleId) != nil {
122
+ externalModuleInfo = moduleInfo
123
+ } else if let prebuiltModuleInfo = dependencyOracle. getModuleInfo ( of: swiftPrebuiltModuleId) {
125
124
externalModuleId = swiftPrebuiltModuleId
125
+ externalModuleInfo = prebuiltModuleInfo
126
126
} else {
127
127
throw Driver . Error. missingExternalDependency ( placeholderId. moduleName)
128
128
}
129
129
130
- let externalModuleInfo = dependencyOracle. getModuleInfo ( of: externalModuleId) !
131
130
let newExternalModuleDetails =
132
131
SwiftPrebuiltExternalModuleDetails ( compiledModulePath: placeholderPath. description)
133
132
let newInfo = ModuleInfo ( modulePath: placeholderPath. description,
0 commit comments