mirror of
https://github.com/clap-rs/clap
synced 2024-12-13 14:22:34 +00:00
Revert "Revert "Fixes arg having required_unless on default values""
This reverts commit 6e85fb3ae0
.
This commit is contained in:
parent
bdb1d324a5
commit
69957c4ddd
2 changed files with 31 additions and 2 deletions
|
@ -70,10 +70,11 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
|
|||
));
|
||||
}
|
||||
self.validate_conflicts(matcher)?;
|
||||
|
||||
if !(self.p.is_set(AS::SubcommandsNegateReqs) && is_subcmd || reqs_validated) {
|
||||
self.validate_required(matcher)?;
|
||||
self.validate_required_unless(matcher)?;
|
||||
}
|
||||
|
||||
self.validate_matched_args(matcher)?;
|
||||
|
||||
Ok(())
|
||||
|
@ -584,6 +585,9 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
|
|||
return self.missing_required_error(matcher, vec![a.id.clone()]);
|
||||
}
|
||||
}
|
||||
|
||||
self.validate_required_unless(matcher)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -620,6 +624,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
|
|||
})
|
||||
.map(|a| a.id.clone())
|
||||
.collect();
|
||||
|
||||
if failed_args.is_empty() {
|
||||
Ok(())
|
||||
} else {
|
||||
|
@ -630,7 +635,7 @@ impl<'help, 'app, 'parser> Validator<'help, 'app, 'parser> {
|
|||
// Failing a required unless means, the arg's "unless" wasn't present, and neither were they
|
||||
fn fails_arg_required_unless(&self, a: &Arg<'help>, matcher: &ArgMatcher) -> bool {
|
||||
debug!("Validator::fails_arg_required_unless: a={:?}", a.name);
|
||||
let exists = |id| matcher.contains(id);
|
||||
let exists = |id| matcher.contains(id) && !matcher.is_default_value(id);
|
||||
|
||||
(a.r_unless_all.is_empty() || !a.r_unless_all.iter().all(exists))
|
||||
&& !a.r_unless.iter().any(exists)
|
||||
|
|
|
@ -1250,3 +1250,27 @@ fn required_if_eq_all_on_default_value() {
|
|||
assert_eq!(m.value_of("opt"), Some("default"));
|
||||
assert!(!m.is_present("flag"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn required_unless_on_default_value() {
|
||||
let result = App::new("prog")
|
||||
.arg(Arg::new("opt").long("opt").default_value("default"))
|
||||
.arg(Arg::new("flag").long("flag").required_unless_present("opt"))
|
||||
.try_get_matches_from(vec!["myprog"]);
|
||||
|
||||
assert!(result.is_err(), "{:?}", result.unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn required_unless_all_on_default_value() {
|
||||
let result = App::new("prog")
|
||||
.arg(Arg::new("opt").long("opt").default_value("default"))
|
||||
.arg(
|
||||
Arg::new("flag")
|
||||
.long("flag")
|
||||
.required_unless_present_all(&["opt"]),
|
||||
)
|
||||
.try_get_matches_from(vec!["myprog"]);
|
||||
|
||||
assert!(result.is_err(), "{:?}", result.unwrap());
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue