Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-01-07 10:18:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2794 from ldm0/simplify

Browse source 
Less format & branch
This commit is contained in:
Pavan Kumar Sunkara 2021-09-28 22:21:09 +01:00 committed by GitHub
commit 5940bb2360
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/parse/parser.rs
View file

@ -910,27 +910,17 @@ impl<'help, 'app> Parser<'help, 'app> {
// help message there are bigger fish to fry // help message there are bigger fish to fry
let mut sc = self.app.clone(); let mut sc = self.app.clone();
for (i, cmd) in cmds.iter().enumerate() { for cmd in cmds.iter() {
if cmd == OsStr::new("help") { if cmd == OsStr::new("help") {
// cmd help help // cmd help help
help_help = true; help_help = true;
break; // Maybe? break; // Maybe?
} }
if let Some(mut c) = sc.find_subcommand(cmd).cloned() { sc = if let Some(c) = sc.find_subcommand(cmd) {
c._build(); c
sc = c; } else if let Some(c) = sc.find_subcommand(&cmd.to_string_lossy()) {
c
if i == cmds.len() - 1 {
break;
}
} else if let Some(mut c) = sc.find_subcommand(&cmd.to_string_lossy()).cloned() {
c._build();
sc = c;
if i == cmds.len() - 1 {
break;
}
} else { } else {
return Err(ClapError::unrecognized_subcommand( return Err(ClapError::unrecognized_subcommand(
self.app, self.app,
@ -942,8 +932,11 @@ impl<'help, 'app> Parser<'help, 'app> {
.to_string(), .to_string(),
)); ));
} }
.clone();
bin_name = format!("{} {}", bin_name, &sc.name); sc._build();
bin_name.push(' ');
bin_name.push_str(&sc.name);
} }
sc sc
@ -964,9 +957,7 @@ impl<'help, 'app> Parser<'help, 'app> {
parser.app.g_settings = self.app.g_settings; parser.app.g_settings = self.app.g_settings;
} }
if parser.app.bin_name != self.app.bin_name { parser.app.bin_name = Some(bin_name);
parser.app.bin_name = Some(format!("{} {}", bin_name, parser.app.name));
}
Err(parser.help_err(self.app.is_set(AS::UseLongFormatForHelpSubcommand))) Err(parser.help_err(self.app.is_set(AS::UseLongFormatForHelpSubcommand)))
} }