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

refactor: Clarify MatchArg::all_val_groups_empty

Browse source
This commit is contained in:
Ed Page 2021-12-27 14:20:27 -06:00
parent a0ab35d678
commit 2d1dfae318
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/parse/matches/matched_arg.rs
View file

@ -77,7 +77,7 @@ impl MatchedArg {
self.vals.last().map(|x| x.len()).unwrap_or(0)
}
pub(crate) fn is_vals_empty(&self) -> bool {
pub(crate) fn all_val_groups_empty(&self) -> bool {
self.vals.iter().flatten().count() == 0
}

2
src/parse/parser.rs
View file

@ -1638,7 +1638,7 @@ impl<'help, 'app> Parser<'help, 'app> {
arg.name
);
match matcher.get(&arg.id) {
Some(ma) if ma.is_vals_empty() => {
Some(ma) if ma.all_val_groups_empty() => {
debug!(
"Parser::add_value:iter:{}: has no user defined vals",
arg.name

4
src/parse/validator.rs
View file

@ -42,7 +42,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
let o = &self.p.app[&a];
reqs_validated = true;
let should_err = if let Some(v) = matcher.0.args.get(&o.id) {
v.is_vals_empty() && !(o.min_vals.is_some() && o.min_vals.unwrap() == 0)
v.all_val_groups_empty() && !(o.min_vals.is_some() && o.min_vals.unwrap() == 0)
} else {
true
};
@ -396,7 +396,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
};
// Issue 665 (https://github.com/clap-rs/clap/issues/665)
// Issue 1105 (https://github.com/clap-rs/clap/issues/1105)
if a.is_set(ArgSettings::TakesValue) && !min_vals_zero && ma.is_vals_empty() {
if a.is_set(ArgSettings::TakesValue) && !min_vals_zero && ma.all_val_groups_empty() {
return Err(Error::empty_value(
self.p.app,
a,