Release 0.2.10

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cargo-hackerman"
-version = "0.2.9"
-edition = "2021"
+version = "0.2.10"
+edition = "2024"
 description = "Workspace hack management and package/feature query"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/pacak/hackerman/"
@@ -12,23 +12,25 @@ exclude = ["TODO", "test_workspaces"]
 [dependencies]
 anyhow = "1.0.52"
 bpaf = { version = "0.9.9", features = ["derive", "autocomplete", "docgen"] }
-cargo-platform = "0.1"
-cargo_metadata = { version = "0.18" }
+cargo_metadata = { version = "0.23" }
 dot = "0.1.4"
 pathdiff = { version = "0.2", features = ["camino"] }
-petgraph = "0.6.0"
+petgraph = "0.8.3"
 semver = "1.0"
-serde = "=1.0.196"
+serde = "1"
 serde_json = "1.0"
 target-spec = "3.0"
 tempfile = { version = "3.3.0" }
-toml_edit = "0.21"
+toml_edit = "0.25"
 tracing = "0.1.29"
 tracing-subscriber = { version = "0.3.5", default-features = false, features = [ "alloc", "env-filter", "registry", "std", "fmt" ] }
-webbrowser = { version = "0.8.10", optional = true }
+webbrowser = { version = "1.2.1", optional = true }
 
 
 [features]
 bright-color = ["bpaf/bright-color"]
 default = ["dull-color"]
 dull-color = ["bpaf/dull-color"]
+
+[workspace]
+members = ["./workspace-gen"]

README.md

@@ -217,7 +217,7 @@ You can pass **`--help`** twice for more detailed help
 
 Unify crate dependencies across individual crates in the workspace
 
-**Usage**: **`cargo hackerman`** **`hack`** _`CARGO_OPTS`_ \[**`--dry`**\] \[**`--lock`**\] \[**`-D`**\]
+**Usage**: **`cargo hackerman`** **`hack`** _`CARGO_OPTS`_ \[**`--dry`**\] \[**`--lock`**\]
 
 You can undo those changes using `cargo hackerman restore`.
 
@@ -251,8 +251,6 @@ You can undo those changes using `cargo hackerman restore`.
   lock = true
   ```
 
-- **`-D`**, **`--no-dev`** — 
-  Don't unify dev dependencies
 - **`-h`**, **`--help`** — 
   Prints help information
 
@@ -300,7 +298,7 @@ Check if unification is required and if checksums are correct
 
 Similar to `cargo-hackerman hack --dry`, but also sets exit status to 1 so you can use it as part of CI process
 
-**Usage**: **`cargo hackerman`** **`check`** _`CARGO_OPTS`_ \[**`-D`**\]
+**Usage**: **`cargo hackerman`** **`check`** _`CARGO_OPTS`_
 
 **Cargo options:**
 - **`    --manifest-path`**=_`PATH`_ — 
@@ -317,8 +315,6 @@ Similar to `cargo-hackerman hack --dry`, but also sets exit status to 1 so you c
 
 
 **Available options:**
-- **`-D`**, **`--no-dev`** — 
-  Don't unify dev dependencies
 - **`-h`**, **`--help`** — 
   Prints help information
 

src/explain.rs

@@ -1,5 +1,5 @@
 use crate::{
-    feat_graph::{FeatGraph, HasIndex},
+    feat_graph::{CrateInstance, FeatGraph, HasIndex},
     metadata::{DepKindInfo, Link},
 };
 
@@ -11,35 +11,36 @@ use semver::Version;
 use std::collections::BTreeSet;
 use tracing::{debug, info};
 
+/// Find all the packages that can be a starting point for a query to display (display purposes)
+///
+/// Match all crates by name, with refining by a feature name and/or version number
 fn collect_packages(
     fg: &mut FeatGraph,
-
     krate: &str,
-    feature: Option<&String>,
+    feature: Option<&str>,
     version: Option<&Version>,
 ) -> Vec<NodeIndex> {
     fg.features
         .node_indices()
         .filter(|&ix| {
-            if let Some(fid) = fg.features[ix].fid() {
-                let package = fid.pid.package();
-                // name must match.
-                // feature must match if given, otherwise look for base
-                // version must match if given
-                package.name == krate
-                    && feature.map_or(fid.pid.base() == fid, |f| fid.pid.named(f) == fid)
-                    && version.map_or(true, |v| package.version == *v)
-            } else {
-                false
-            }
+            let Some(fid) = fg.features[ix].fid() else {
+                return false;
+            };
+            let package = fid.pid.package();
+            // name must match.
+            // feature must match if given, otherwise look for base
+            // version must match if given
+            package.name == krate
+                && version.is_none_or(|v| package.version == *v)
+                && (feature.is_none() || feature == fid.name())
         })
         .collect::<Vec<_>>()
 }
 
 pub fn tree<'a>(
     fg: &'a mut FeatGraph<'a>,
     krate: Option<&String>,
-    feature: Option<&String>,
+    feature: Option<&str>,
     version: Option<&Version>,
     package_nodes: bool,
     workspace: bool,
@@ -54,7 +55,7 @@ pub fn tree<'a>(
             let members = fg.workspace_members.clone();
             members
                 .iter()
-                .map(|f| fg.fid_index(f.base()))
+                .map(|f| fg.fid_index(f.base(CrateInstance::Target)))
                 .collect::<Vec<_>>()
         }
     };
@@ -82,6 +83,7 @@ pub fn tree<'a>(
                 node
             };
             nodes.insert(this_node);
+
             for edge in g.edges_directed(node, petgraph::EdgeDirection::Outgoing) {
                 if package_nodes {
                     new_edges.insert((
@@ -97,7 +99,7 @@ pub fn tree<'a>(
 
     if package_nodes {
         for (a, b) in new_edges {
-            let a = a.get_index(fg)?;
+            let a = a.get_index(fg, CrateInstance::Target)?;
             if a != b {
                 let link = Link {
                     optional: false,
@@ -119,7 +121,7 @@ pub fn tree<'a>(
 pub fn explain<'a>(
     fg: &'a mut FeatGraph<'a>,
     krate: &str,
-    feature: Option<&String>,
+    feature: Option<&str>,
     version: Option<&Version>,
     package_nodes: bool,
     stdout: bool,
@@ -178,7 +180,7 @@ pub fn explain<'a>(
 
     if package_nodes {
         for (a, b) in new_edges {
-            let a = a.get_index(fg)?;
+            let a = a.get_index(fg, CrateInstance::Target)?;
             if a != b {
                 let link = Link {
                     optional: false,