Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 14:52:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Eliminate unreachable branch

Browse source 
comment fix

Apply fmt
This commit is contained in:
Donough Liu 2020-12-30 00:39:20 +08:00 committed by ldm0
parent 944fc759c9
commit c8e669c690
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/parse/parser.rs
View file

@ -892,7 +892,7 @@ impl<'help, 'app> Parser<'help, 'app> {
{
let mut p = Parser::new(sc);
// HACK: maintain indexes between parsers
// FlagSubCommand short arg needs to revist the current short args, but skip the subcommand itself
// FlagSubCommand short arg needs to revisit the current short args, but skip the subcommand itself
if keep_state {
p.cur_idx.set(self.cur_idx.get());
p.skip_idxs = self.skip_idxs;
@ -1034,8 +1034,11 @@ impl<'help, 'app> Parser<'help, 'app> {
.iter()
.map(|x| x.to_str().expect(INVALID_UTF8))
.collect();
self.did_you_mean_error(arg.to_str().expect(INVALID_UTF8), matcher, &remaining_args)
.map(|_| ParseResult::NotFound)
Err(self.did_you_mean_error(
arg.to_str().expect(INVALID_UTF8),
matcher,
&remaining_args,
))
}
}
@ -1470,7 +1473,7 @@ impl<'help, 'app> Parser<'help, 'app> {
arg: &str,
matcher: &mut ArgMatcher,
remaining_args: &[&str],
) -> ClapResult<()> {
) -> ClapError {
debug!("Parser::did_you_mean_error: arg={}", arg);
// Didn't match a flag or option
let longs = self
@ -1511,12 +1514,12 @@ impl<'help, 'app> Parser<'help, 'app> {
.cloned()
.collect();
Err(ClapError::unknown_argument(
ClapError::unknown_argument(
format!("--{}", arg),
did_you_mean,
Usage::new(self).create_usage_with_title(&*used),
self.app.color(),
))
)
}
pub(crate) fn write_help_err(&self) -> ClapResult<Colorizer> {