Deduplicate nodes across roots.

Author: ehuss

src/cargo/ops/tree/mod.rs

@@ -182,14 +182,15 @@ fn print(opts: &TreeOptions, roots: Vec<usize>, graph: &Graph<'_>) -> CargoResul
         Prefix::Indent
     };
 
+    // The visited deps is used to display a (*) whenever a dep has
+    // already been printed (ignored with --no-dedupe).
+    let mut visited_deps = HashSet::new();
+
     for (i, root_index) in roots.into_iter().enumerate() {
         if i != 0 {
             println!();
         }
 
-        // The visited deps is used to display a (*) whenever a dep has
-        // already been printed (ignored with --no-dedupe).
-        let mut visited_deps = HashSet::new();
         // A stack of bools used to determine where | symbols should appear
         // when printing a line.
         let mut levels_continue = vec![];

tests/testsuite/tree.rs

@@ -109,7 +109,7 @@ b v0.1.0 ([..]/foo/b)
 ├── c v1.0.0 ([..]/foo/c)
 └── somedep v1.0.0
 
-c v1.0.0 ([..]/foo/c)
+c v1.0.0 ([..]/foo/c) (*)
 ",
         )
         .run();
@@ -821,7 +821,7 @@ dog v1.0.0
 └── a v0.1.0 ([..]/foo/a)
 
 dog v2.0.0
-└── a v0.1.0 ([..]/foo/a)
+└── a v0.1.0 ([..]/foo/a) (*)
 ",
         )
         .run();
@@ -834,7 +834,7 @@ cat v1.0.0
     └── b v0.1.0 ([..]/foo/b)
 
 cat v2.0.0
-└── b v0.1.0 ([..]/foo/b)
+└── b v0.1.0 ([..]/foo/b) (*)
 ",
         )
         .run();
@@ -1103,7 +1103,7 @@ bar v1.0.0
 
 bar v1.0.0
 [build-dependencies]
-└── foo v0.1.0 ([..]/foo)
+└── foo v0.1.0 ([..]/foo) (*)
 ",
         )
         .run();
@@ -1205,7 +1205,7 @@ somedep v1.0.0
 
 somedep v1.0.0
 └── pm v1.0.0
-    └── foo v0.1.0 ([..]/foo)
+    └── foo v0.1.0 ([..]/foo) (*)
 ",
         )
         .run();
@@ -1344,8 +1344,7 @@ a v0.1.0 ([..]/foo/a)
     └── optdep v1.0.0
 
 b v0.1.0 ([..]/foo/b)
-└── somedep v1.0.0
-    └── optdep v1.0.0
+└── somedep v1.0.0 (*)
 ",
         )
         .run();

tests/testsuite/tree_graph_features.rs

@@ -143,7 +143,7 @@ a v0.1.0 ([..]/foo/a)
 └── b feature \"feat2\"
     └── b v0.1.0 ([..]/foo/b) (*)
 
-b v0.1.0 ([..]/foo/b)
+b v0.1.0 ([..]/foo/b) (*)
 ",
         )
         .run();
@@ -158,10 +158,7 @@ a v0.1.0 ([..]/foo/a)
 
 b v0.1.0 ([..]/foo/b)
 ├── b feature \"default\" (command-line)
-│   └── a v0.1.0 ([..]/foo/a)
-│       ├── a feature \"a1\"
-│       │   └── a feature \"default\" (command-line)
-│       └── a feature \"default\" (command-line) (*)
+│   └── a v0.1.0 ([..]/foo/a) (*)
 ├── b feature \"feat1\"
 │   └── b feature \"default\" (command-line) (*)
 └── b feature \"feat2\"