Skip to content

Commit ad28b65

Browse files
author
David Ungar
committed
Pass lit tests
1 parent ff63ec1 commit ad28b65

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ extension ModuleDependencyGraph {
130130
precondition(dependencySource.typedFile.type == .swiftDeps)
131131
guard let sourceGraph = dependencySource.read(
132132
in: fileSystem,
133-
reporter: reporter,
134-
diagnosticEngine: diagnosticEngine)
133+
reporter: reporter)
135134
else {
136135
return nil
137136
}
@@ -189,8 +188,7 @@ extension ModuleDependencyGraph {
189188
dependencySource.typedFile)
190189
guard let sourceGraph = dependencySource.read(
191190
in: fileSystem,
192-
reporter: reporter,
193-
diagnosticEngine: diagnosticEngine)
191+
reporter: reporter)
194192
else {
195193
return nil
196194
}

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/DependencySource.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ extension DependencySource {
6262
/// Returns nil if no dependency info there.
6363
public func read(
6464
in fileSystem: FileSystem,
65-
reporter: IncrementalCompilationState.Reporter?,
66-
diagnosticEngine: DiagnosticsEngine
65+
reporter: IncrementalCompilationState.Reporter?
6766
) -> SourceFileDependencyGraph? {
6867
let graphIfPresent: SourceFileDependencyGraph?
6968
do {
@@ -73,7 +72,6 @@ extension DependencySource {
7372
}
7473
catch {
7574
let msg = "Could not read \(file) \(error.localizedDescription)"
76-
diagnosticEngine.emit(warning: msg)
7775
reporter?.report(msg, typedFile)
7876
return nil
7977
}

Tests/SwiftDriverTests/ModuleDependencyGraphTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,10 +1103,10 @@ fileprivate struct SourceFileDependencyGraphMocker {
11031103
private mutating func findExistingNodeOrCreateIfNew(_ key: DependencyKey, _ fingerprint: String?,
11041104
isProvides: Bool) -> Node {
11051105
func createNew() -> Node {
1106-
let n = Node(key: key, fingerprint: fingerprint,
1107-
sequenceNumber: allNodes.count,
1108-
defsIDependUpon: [],
1109-
isProvides: isProvides)
1106+
let n = try! Node(key: key, fingerprint: fingerprint,
1107+
sequenceNumber: allNodes.count,
1108+
defsIDependUpon: [],
1109+
isProvides: isProvides)
11101110
allNodes.append(n)
11111111
memoizedNodes[key] = n
11121112
return n

0 commit comments

Comments
 (0)