fix(help): Help subcommands usage includes requires arguments

clap-rs · Apr 30, 2022 · 1452c1e · 1452c1e
1 parent 37ebb71
commit 1452c1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
@@ -613,20 +613,15 @@ impl<'help, 'cmd> Parser<'help, 'cmd> {
     ) -> ClapResult<ParseResult> {
         debug!("Parser::parse_help_subcommand");
 
-        let mut bin_name = self
-            .cmd
-            .get_bin_name()
-            .unwrap_or_else(|| self.cmd.get_name())
-            .to_owned();
-
+        let mut cmd = self.cmd.clone();
         let mut sc = {
-            let mut sc = self.cmd.clone();
+            let mut sc = &mut cmd;
 
             for cmd in cmds {
-                sc = if let Some(c) = sc.find_subcommand(cmd) {
-                    c
-                } else if let Some(c) = sc.find_subcommand(&cmd.to_string_lossy()) {
-                    c
+                sc = if let Some(sc_name) =
+                    sc.find_subcommand(cmd).map(|sc| sc.get_name().to_owned())
+                {
+                    sc._build_subcommand(&sc_name).unwrap()
                 } else {
                     return Err(ClapError::unrecognized_subcommand(
                         self.cmd,
@@ -636,18 +631,11 @@ impl<'help, 'cmd> Parser<'help, 'cmd> {
                             .unwrap_or_else(|| self.cmd.get_name())
                             .to_owned(),
                     ));
-                }
-                .clone();
-
-                sc._build_self();
-                bin_name.push(' ');
-                bin_name.push_str(sc.get_name());
+                };
             }
 
             sc
         };
-        sc = sc.bin_name(bin_name);
-
         let parser = Parser::new(&mut sc);
 
         Err(parser.help_err(true, Stream::Stdout))

diff --git a/tests/builder/help.rs b/tests/builder/help.rs
@@ -2656,7 +2656,7 @@ fn parent_cmd_req_in_usage_with_help_subcommand() {
 some
 
 USAGE:
-    parent test
+    parent <TARGET> <ARGS> test
 
 OPTIONS:
     -h, --help    Print help information