Merge pull request #457 from davidungar/fix-broken-main

David Ungar · web-flow · commit 9962b823f0c4 · 2021-02-02T19:35:38.000-08:00
Fix the breaks
diff --git a/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift b/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift
@@ -920,7 +920,7 @@ extension ModuleDependencyGraph {
   func matches(_ other: ModuleDependencyGraph) -> Bool {
     guard nodeFinder.matches(other.nodeFinder),
       tracedNodes.matches(other.tracedNodes),
-      sourceSwiftDepsMap.matches(other.sourceSwiftDepsMap),
+      inputDependencySourceMap.matches(other.inputDependencySourceMap),
       externalDependencies.matches(other.externalDependencies)
     else {
       return false
@@ -935,7 +935,7 @@ extension Set where Element == ModuleDependencyGraph.Node {
   }
 }
 
-extension BidirectionalMap where T1 == TypedVirtualPath, T2 == ModuleDependencyGraph.SwiftDeps {
+extension BidirectionalMap where T1 == TypedVirtualPath, T2 == ModuleDependencyGraph.DependencySource {
   fileprivate func matches(_ other: Self) -> Bool {
     self == other
   }

Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ extension ModuleDependencyGraph {`
`920`	`920`	`func matches(_ other: ModuleDependencyGraph) -> Bool {`
`921`	`921`	`guard nodeFinder.matches(other.nodeFinder),`
`922`	`922`	`tracedNodes.matches(other.tracedNodes),`
`923`		`- sourceSwiftDepsMap.matches(other.sourceSwiftDepsMap),`
	`923`	`+ inputDependencySourceMap.matches(other.inputDependencySourceMap),`
`924`	`924`	`externalDependencies.matches(other.externalDependencies)`
`925`	`925`	`else {`
`926`	`926`	`return false`
`@@ -935,7 +935,7 @@ extension Set where Element == ModuleDependencyGraph.Node {`
`935`	`935`	`}`
`936`	`936`	`}`
`937`	`937`
`938`		`-extension BidirectionalMap where T1 == TypedVirtualPath, T2 == ModuleDependencyGraph.SwiftDeps {`
	`938`	`+extension BidirectionalMap where T1 == TypedVirtualPath, T2 == ModuleDependencyGraph.DependencySource {`
`939`	`939`	`fileprivate func matches(_ other: Self) -> Bool {`
`940`	`940`	`self == other`
`941`	`941`	`}`