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

fix(derive): Make Command::allow_hyphen_values forward to Arg

Browse source
This commit is contained in:
Ed Page 2022-09-06 17:11:58 -05:00
parent fd9a5a1d50
commit 7a2bbca62b
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/builder/command.rs
View file

@ -3818,6 +3818,14 @@ impl Command {
} }
} }
} }
#[allow(deprecated)]
if self.is_allow_hyphen_values_set() {
for arg in self.args.args_mut() {
if arg.is_takes_value_set() {
arg.settings.insert(ArgSettings::AllowHyphenValues.into());
}
}
}
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
assert_app(self); assert_app(self);

13
src/parser/parser.rs
View file

@ -634,8 +634,7 @@ impl<'cmd> Parser<'cmd> {
current_positional.get_id() current_positional.get_id()
); );
if self.cmd.is_allow_hyphen_values_set() if self.cmd[&current_positional.id].is_allow_hyphen_values_set()
|| self.cmd[&current_positional.id].is_allow_hyphen_values_set()
|| (self.cmd.is_allow_negative_numbers_set() && next.is_number()) || (self.cmd.is_allow_negative_numbers_set() && next.is_number())
{ {
// If allow hyphen, this isn't a new arg. // If allow hyphen, this isn't a new arg.
@ -807,9 +806,6 @@ impl<'cmd> Parser<'cmd> {
} }
} else if let Some(sc_name) = self.possible_long_flag_subcommand(long_arg) { } else if let Some(sc_name) = self.possible_long_flag_subcommand(long_arg) {
Ok(ParseResult::FlagSubCommand(sc_name.to_string())) Ok(ParseResult::FlagSubCommand(sc_name.to_string()))
} else if self.cmd.is_allow_hyphen_values_set() {
debug!("Parser::parse_long_arg: contains non-long flag");
Ok(ParseResult::MaybeHyphenValue)
} else if self } else if self
.cmd .cmd
.get_keymap() .get_keymap()
@ -850,13 +846,6 @@ impl<'cmd> Parser<'cmd> {
} else if self.cmd.is_allow_negative_numbers_set() && short_arg.is_number() { } else if self.cmd.is_allow_negative_numbers_set() && short_arg.is_number() {
debug!("Parser::parse_short_arg: negative number"); debug!("Parser::parse_short_arg: negative number");
return Ok(ParseResult::MaybeHyphenValue); return Ok(ParseResult::MaybeHyphenValue);
} else if self.cmd.is_allow_hyphen_values_set()
&& short_arg
.clone()
.any(|c| !c.map(|c| self.cmd.contains_short(c)).unwrap_or_default())
{
debug!("Parser::parse_short_args: contains non-short flag");
return Ok(ParseResult::MaybeHyphenValue);
} else if self } else if self
.cmd .cmd
.get_keymap() .get_keymap()

2
tests/builder/app_settings.rs
View file

@ -862,7 +862,7 @@ fn issue_1066_allow_leading_hyphen_and_unknown_args_option() {
let res = Command::new("prog") let res = Command::new("prog")
.allow_hyphen_values(true) .allow_hyphen_values(true)
.arg(arg!(--"some-argument" <val>)) .arg(arg!(--"some-argument" <val>))
.try_get_matches_from(vec!["prog", "-hello"]); .try_get_matches_from(vec!["prog", "-fish"]);
assert!(res.is_err()); assert!(res.is_err());
assert_eq!(res.unwrap_err().kind(), ErrorKind::UnknownArgument); assert_eq!(res.unwrap_err().kind(), ErrorKind::UnknownArgument);