Fix arg parsing

Author: pnehrer

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "cargo-wsdeps"
 description = "Cargo subcommand to manage dependencies in a workspace."
-version = "0.1.0"
+version = "0.1.1"
 repository = "https://github.com/ecliptical/cargo-wsdeps"
 edition = "2024"
 authors = ["Peter Nehrer <pnehrer@eclipticalsoftware.com>"]

Cargo.toml

@@ -9,10 +9,17 @@ use jemallocator::Jemalloc;
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
-/// Manage Cargo workspace dependencies.
-#[derive(Debug, Parser)]
+#[derive(Parser)]
+#[command(name = "cargo")]
 #[command(bin_name = "cargo")]
-struct Cli {
+#[command(styles = clap_cargo::style::CLAP_STYLING)]
+enum CargoCli {
+    Wsdeps(WsDepsArgs),
+}
+
+#[derive(clap::Args)]
+#[command(version, about, long_about = None)]
+struct WsDepsArgs {
     #[command(flatten)]
     manifest: clap_cargo::Manifest,
     #[command(flatten)]
@@ -36,20 +43,20 @@ enum Commands {
 }
 
 fn main() -> anyhow::Result<()> {
-    let cli = Cli::parse();
-    let mut metadata = cli.manifest.metadata();
-    cli.features.forward_metadata(&mut metadata);
+    let CargoCli::Wsdeps(args) = CargoCli::parse();
+    let mut metadata = args.manifest.metadata();
+    args.features.forward_metadata(&mut metadata);
     let metadata = metadata.exec()?;
     let manifest = Manifest::from_path(metadata.workspace_root.join("Cargo.toml"))?;
     let Some(ref workspace) = manifest.workspace else {
         return Ok(());
     };
 
-    let (selected, _) = cli.workspace.partition_packages(&metadata);
+    let (selected, _) = args.workspace.partition_packages(&metadata);
 
     let (add, remove) = partition_dependencies(workspace, &selected)?;
 
-    match cli.cmd {
+    match args.cmd {
         Commands::Show => {
             print_changes(&add, &remove);
         }

src/main.rs

@@ -8,7 +8,11 @@ use std::path::Path;
 fn diff_empty_workspace() -> Result<()> {
     let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("test-resources/empty-workspace");
     let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    cmd.current_dir(&dir).arg("diff").assert().failure();
+    cmd.current_dir(&dir)
+        .arg("wsdeps")
+        .arg("diff")
+        .assert()
+        .failure();
 
     Ok(())
 }
@@ -19,6 +23,7 @@ fn diff_multi_member() -> Result<()> {
     let expected = fs::read_to_string(dir.join("diff.patch"))?;
     let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
     cmd.current_dir(&dir)
+        .arg("wsdeps")
         .arg("diff")
         .assert()
         .success()
@@ -32,6 +37,7 @@ fn diff_single_member() -> Result<()> {
     let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("test-resources/single-member");
     let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
     cmd.current_dir(&dir)
+        .arg("wsdeps")
         .arg("diff")
         .assert()
         .success()
@@ -45,6 +51,7 @@ fn diff_standalone() -> Result<()> {
     let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("test-resources/standalone");
     let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
     cmd.current_dir(&dir)
+        .arg("wsdeps")
         .arg("diff")
         .assert()
         .success()