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

Merge pull request #4269 from epage/usage

Browse source 
fix(error): Polish `--flag=bad-value` error
This commit is contained in:
Ed Page 2022-09-27 09:42:11 -05:00 committed by GitHub
commit 9cd1939535
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/parser/parser.rs
View file

@ -183,7 +183,7 @@ impl<'cmd> Parser<'cmd> {
self.cmd,
rest,
arg,
Usage::new(self.cmd).create_usage_no_title(&used),
Usage::new(self.cmd).create_usage_with_title(&used),
));
}
ParseResult::MaybeHyphenValue => {
@ -778,7 +778,7 @@ impl<'cmd> Parser<'cmd> {
"Parser::parse_long_arg({:?}): Got invalid literal `{:?}`",
long_arg, rest
);
let used: Vec<Id> = matcher
let mut used: Vec<Id> = matcher
.arg_ids()
.filter(|arg_id| {
matcher.check_explicit(arg_id, &crate::builder::ArgPredicate::IsPresent)
@ -790,6 +790,7 @@ impl<'cmd> Parser<'cmd> {
})
.cloned()
.collect();
used.push(arg.get_id().clone());
Ok(ParseResult::UnneededAttachedValue {
rest: rest.to_str_lossy().into_owned(),

18
tests/builder/flags.rs
View file

@ -136,6 +136,24 @@ fn multiple_flags_in_single() {
assert!(*m.get_one::<bool>("debug").expect("defaulted by clap"));
}
#[test]
#[cfg(feature = "error-context")]
fn unexpected_value_error() {
const USE_FLAG_AS_ARGUMENT: &str = "\
error: The value 'foo' was provided to '--a-flag' but it wasn't expecting any more values
Usage: mycat --a-flag [filename]
For more information try '--help'
";
let cmd = Command::new("mycat")
.arg(Arg::new("filename"))
.arg(Arg::new("a-flag").long("a-flag").action(ArgAction::SetTrue));
utils::assert_output(cmd, "mycat --a-flag=foo", USE_FLAG_AS_ARGUMENT, true);
}
#[test]
#[cfg(feature = "error-context")]
fn issue_1284_argument_in_flag_style() {