Merge pull request #408 from davidungar/better-dep-printing

[Incremental] Better dependency node printing

Author: David Ungar

Sources/SwiftDriver/Incremental Compilation/DependencyKey.swift

@@ -68,19 +68,19 @@ public struct DependencyKey: Hashable, CustomStringConvertible {
     public var description: String {
       switch self {
       case let .topLevel(name: name):
-        return "top-level name \(name)"
+        return "top-level name '\(name)'"
       case let .nominal(context: context):
-        return "type \(context)"
+        return "type '\(context)'"
       case let .potentialMember(context: context):
-        return "potential members of \(context)"
+        return "potential members of '\(context)'"
       case let .member(context: context, name: name):
-        return "member \(name) of \(context)"
+        return "member '\(name)' of '\(context)'"
       case let .dynamicLookup(name: name):
-        return "AnyObject member \(name)"
+        return "AnyObject member '\(name)'"
       case let .externalDepend(externalDependency):
-        return "module \(externalDependency)"
+        return "module '\(externalDependency)'"
       case let .sourceFileProvide(name: name):
-        return (try? VirtualPath(path: name).basename) ?? name
+        return "source file '\((try? VirtualPath(path: name).basename) ?? name)'"
       }
     }
   }

Sources/SwiftDriver/Incremental Compilation/ModuleDependencyGraph Parts/Node.swift

@@ -99,7 +99,7 @@ extension ModuleDependencyGraph.Node: Comparable {
 
 extension ModuleDependencyGraph.Node: CustomStringConvertible {
   public var description: String {
-    "\(dependencyKey)\( swiftDeps?.description ?? "<expat>")"
+    "\(dependencyKey) \( swiftDeps.map { "in \($0.description)" } ?? "<expat>" )"
   }
 }
 

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -496,7 +496,7 @@ final class IncrementalCompilationTests: XCTestCase {
         "Forming batch job from 1 constituents: main.swift",
         "Incremental compilation: Queuing Compiling main.swift",
         "Starting Compiling main.swift",
-        "Incremental compilation: Traced: interface of main.swiftdeps from: main.swift -> interface of top-level name foo from: main.swift -> implementation of other.swiftdeps from: other.swift",
+        "Incremental compilation: Traced: interface of source file 'main.swiftdeps' from: main.swift -> interface of top-level name 'foo' from: main.swift -> implementation of source file 'other.swiftdeps' from: other.swift",
         "Incremental compilation: Queuing because of dependencies discovered later: {compile: other.o <= other.swift}",
         "Incremental compilation: Scheduling discovered {compile: other.o <= other.swift}",
         "Finished Compiling main.swift",
@@ -520,7 +520,7 @@ final class IncrementalCompilationTests: XCTestCase {
         "Incremental compilation: May skip current input: {compile: other.o <= other.swift}",
         "Incremental compilation: Queuing (initial): {compile: main.o <= main.swift}",
         "Incremental compilation: scheduling dependents of main.swift; -driver-always-rebuild-dependents",
-        "Incremental compilation: Traced: interface of top-level name foo from: main.swift -> implementation of other.swiftdeps from: other.swift",
+        "Incremental compilation: Traced: interface of top-level name 'foo' from: main.swift -> implementation of source file 'other.swiftdeps' from: other.swift",
         "Incremental compilation: Found dependent of main.swift: {compile: other.o <= other.swift}",
         "Incremental compilation: Immediately scheduling dependent on main.swift {compile: other.o <= other.swift}",
         "Incremental compilation: Queuing (dependent): {compile: other.o <= other.swift}",