From de976387f46219c749752050fb2eeff55485ba10 Mon Sep 17 00:00:00 2001
From: Jynn Nelson <jynn.nelson@ferrous-systems.com>
Date: Thu, 25 Sep 2025 16:32:53 -0700
Subject: [PATCH] Don't crash when running `cargo profdata --help`

Previously, the cargo wrapper tried to access CLI flags that were only
defined when `needs_build` was true. Omit the access for commands that
don't need those flags.

Before:
```
thread 'main' (13996246) panicked at src/lib.rs:283:37:
Mismatch between definition and access of `features`. Unknown argument
or group id.  Make sure you are using the argument id and not the short
or long flags
```

After:
```
Proxy for the `llvm-profdata` tool shipped with the Rust toolchain.

Usage: cargo-profdata [OPTIONS] [-- <args>...]
...
```
---
 src/lib.rs | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index b08cf51..fae4719 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -170,6 +170,10 @@ To see all the flags the proxied tool accepts run `cargo-{} -- --help`.{}",
                 .last(true)
                 .num_args(1..)
                 .help("The arguments to be proxied to the tool"),
+            // We look at .cargo/config.toml even when we don't build the binary.
+            Arg::new("manifest-path")
+                .long("manifest-path")
+                .help("Path to Cargo.tom"),
         ])
         .after_help(after_help);
 
@@ -223,9 +227,6 @@ To see all the flags the proxied tool accepts run `cargo-{} -- --help`.{}",
                 .long("profile")
                 .value_name("PROFILE-NAME")
                 .help("Build artifacts with the specified profile"),
-            Arg::new("manifest-path")
-                .long("manifest-path")
-                .help("Path to Cargo.tom"),
             Arg::new("features")
                 .long("features")
                 .short('F')
@@ -280,16 +281,18 @@ To see all the flags the proxied tool accepts run `cargo-{} -- --help`.{}",
 
 pub fn run(tool: Tool, matches: ArgMatches) -> Result<i32> {
     let mut metadata_command = MetadataCommand::new();
-    if let Some(features) = matches.get_many::<String>("features") {
-        metadata_command.features(CargoOpt::SomeFeatures(
-            features.map(|s| s.to_owned()).collect(),
-        ));
-    }
-    if matches.get_flag("no-default-features") {
-        metadata_command.features(CargoOpt::NoDefaultFeatures);
-    }
-    if matches.get_flag("all-features") {
-        metadata_command.features(CargoOpt::AllFeatures);
+    if tool.needs_build() {
+        if let Some(features) = matches.get_many::<String>("features") {
+            metadata_command.features(CargoOpt::SomeFeatures(
+                features.map(|s| s.to_owned()).collect(),
+            ));
+        }
+        if matches.get_flag("no-default-features") {
+            metadata_command.features(CargoOpt::NoDefaultFeatures);
+        }
+        if matches.get_flag("all-features") {
+            metadata_command.features(CargoOpt::AllFeatures);
+        }
     }
     if let Some(path) = matches.get_one::<String>("manifest-path") {
         metadata_command.manifest_path(path);