Disambiguate multiple crates with the same name

src/dep_info.rs

@@ -17,6 +17,7 @@ pub struct DepInfo {
     pub is_optional_direct: bool,
 
     /// whether this edge has been updated by update_dep_info after being inserted into the graph
+    // TODO: Store separately from DepInfo, make dedicated enum
     pub visited: bool,
 }
 

src/main.rs

@@ -9,6 +9,8 @@ mod package;
 
 // Contains the `DepGraph` type and most of the graph building / analysis logic
 mod graph;
+// Contains some auxiliary logic (currently just checking for packages of the same name)
+mod util;
 
 // Command-line parsing
 mod cli;
@@ -19,6 +21,7 @@ use self::{
     cli::parse_options,
     graph::{dedup_transitive_deps, get_dep_graph, update_dep_info},
     output::dot,
+    util::set_name_stats,
 };
 
 fn main() -> anyhow::Result<()> {
@@ -57,6 +60,7 @@ fn main() -> anyhow::Result<()> {
     if config.dedup_transitive_deps {
         dedup_transitive_deps(&mut graph);
     }
+    set_name_stats(&mut graph);
 
     println!("{:?}", dot(&graph));
 

src/package.rs

@@ -1,4 +1,8 @@
-use std::fmt::{self, Debug, Formatter};
+use std::{
+    cell::Cell,
+    fmt::{self, Debug, Formatter},
+    rc::Rc,
+};
 
 use cargo_metadata::Source;
 use semver::Version;
@@ -11,6 +15,8 @@ pub struct Package {
     pub version: Version,
     pub source: Option<Source>,
     pub dep_info: Option<DepInfo>,
+
+    pub name_uses: Option<Rc<Cell<u16>>>,
 }
 
 impl Package {
@@ -20,6 +26,7 @@ impl Package {
             version: pkg.version.clone(),
             source: pkg.source.clone(),
             dep_info: if is_ws_member { None } else { Some(DepInfo::default()) },
+            name_uses: None,
         }
     }
 
@@ -29,8 +36,12 @@ impl Package {
 }
 
 impl Debug for Package {
-    // TODO: Allow writing version and such
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.name)
+        write!(f, "{}", self.name)?;
+        if self.name_uses.as_ref().unwrap().get() > 1 {
+            write!(f, " {}", self.version)?;
+        }
+
+        Ok(())
     }
 }

src/util.rs

@@ -0,0 +1,13 @@
+use std::{cell::Cell, collections::HashMap, rc::Rc};
+
+use crate::graph::DepGraph;
+
+pub fn set_name_stats(graph: &mut DepGraph) {
+    let mut name_uses_map = HashMap::<String, Rc<Cell<u16>>>::new();
+    for pkg in graph.node_weights_mut() {
+        let name_uses = name_uses_map.entry(pkg.name.clone()).or_default().clone();
+        name_uses.set(name_uses.get() + 1);
+
+        pkg.name_uses = Some(name_uses);
+    }
+}