Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-03-04 23:37:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use default value when option is passed

Browse source
This commit is contained in:
David Hewitt 2020-10-13 22:21:01 +01:00
parent 5a1a209965
commit 94f6889116
3 changed files with 49 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/parse/parser.rs
View file

@ -1612,23 +1612,8 @@ impl<'help, 'app> Parser<'help, 'app> {
if !arg.default_vals.is_empty() {
debug!("Parser::add_value:iter:{}: has default vals", arg.name);
if matcher
.get(&arg.id)
.map(|ma| ma.vals.len())
.map(|len| len == 0)
.unwrap_or(false)
{
debug!(
"Parser::add_value:iter:{}: has no user defined vals",
arg.name
);
for val in &arg.default_vals {
self.add_val_to_arg(arg, &ArgStr::new(val), matcher, ty)?;
}
} else if matcher.get(&arg.id).is_some() {
debug!("Parser::add_value:iter:{}: has user defined vals", arg.name);
if matcher.get(&arg.id).is_some() {
debug!("Parser::add_value:iter:{}: was used", arg.name);
// do nothing
} else {
debug!("Parser::add_value:iter:{}: wasn't used", arg.name);
@ -1646,6 +1631,39 @@ impl<'help, 'app> Parser<'help, 'app> {
// do nothing
}
if !arg.default_missing_vals.is_empty() {
debug!(
"Parser::add_value:iter:{}: has default missing vals",
arg.name
);
match matcher.get(&arg.id) {
Some(ma) if ma.vals.is_empty() => {
debug!(
"Parser::add_value:iter:{}: has no user defined vals",
arg.name
);
for val in &arg.default_missing_vals {
self.add_val_to_arg(arg, &ArgStr::new(val), matcher, ty)?;
}
}
None => {
debug!("Parser::add_value:iter:{}: wasn't used", arg.name);
// do nothing
}
_ => {
debug!("Parser::add_value:iter:{}: has user defined vals", arg.name);
// do nothing
}
}
} else {
debug!(
"Parser::add_value:iter:{}: doesn't have default missing vals",
arg.name
);
// do nothing
}
Ok(())
}

13
tests/default_vals.rs
View file

@ -11,6 +11,19 @@ fn opts() {
assert_eq!(m.value_of("o").unwrap(), "default");
}
#[test]
fn opt_without_value_fail() {
let r = App::new("df")
.arg(Arg::from("-o [opt] 'some opt'").default_value("default"))
.try_get_matches_from(vec!["", "-o"]);
assert!(r.is_err());
let err = r.unwrap_err();
assert_eq!(err.kind, ErrorKind::EmptyValue);
assert!(err
.to_string()
.contains("The argument '-o <opt>' requires a value but none was supplied"));
}
#[test]
fn opt_user_override() {
let r = App::new("df")

2
tests/opts.rs
View file

@ -402,7 +402,7 @@ fn issue_1047_min_zero_vals_default_val() {
.long("del")
.setting(ArgSettings::RequireEquals)
.min_values(0)
.default_value("default"),
.default_missing_value("default"),
)
.get_matches_from(vec!["foo", "-d"]);
assert_eq!(m.occurrences_of("del"), 1);