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

fix(Usage): fixes a bug where required args aren't filtered properly

Browse source 
Closes #277
This commit is contained in:
Kevin K 2015-10-02 19:20:56 -04:00
parent 0e3733e4fe
commit 72b453dc17
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/app/app.rs
View file

@ -3272,13 +3272,28 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
return Err(self.report_error(format!("The argument '{}' isn't valid", return Err(self.report_error(format!("The argument '{}' isn't valid",
Format::Warning(format!("-{}", c))), Format::Warning(format!("-{}", c))),
ClapErrorType::InvalidArgument, ClapErrorType::InvalidArgument,
Some(matches.args.keys().map(|k| *k).collect()))); Some(matches.args.keys()
.map(|k| *k)
.filter(|k| {
if let Some(o) = self.opts.get(k) {
!o.settings.is_set(&ArgSettings::Required)
} else if let Some(p) = self.positionals_name.get(k) {
if let Some(p) = self.positionals_idx.get(p) {
!p.settings.is_set(&ArgSettings::Required)
} else {
true
}
} else {
true
}
})
.collect())));
} }
} }
Err(e) => return Err(e), Err(e) => return Err(e),
} }
} }
unreachable!(); return Ok(None);
} }
fn parse_single_short_flag(&mut self, fn parse_single_short_flag(&mut self,