rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-07-11 14:30:24 +02:00
Code Issues Releases Activity

argv: update clap to 2.29.4

Browse Source 
We use the new AppSettings::AllArgsOverrideSelf to permit all flags to
be specified multiple times. This removes the need for our previous
work-around where we would enable `multiple` for every flag and then
just extract the last value when consuming clap's matches.

We also add a couple regression tests that ensure repeated switches and
flags work as expected.
This commit is contained in:
Andrew Gallant
2018-02-05 19:22:44 -05:00
parent 85cd3f0a6e
commit 8cb5833ef9
5 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app.rs
View File

@ -67,6 +67,7 @@ pub fn app() -> App<'static, 'static> {
.about(ABOUT)
.max_term_width(100)
.setting(AppSettings::UnifiedHelpMessage)
.setting(AppSettings::AllArgsOverrideSelf)
.usage(USAGE)
.template(TEMPLATE)
.help_message("Prints help information. Use --help for more details.");
@ -250,8 +251,7 @@ impl RGArg {
/// inspect the number of times the switch is used.
fn switch(long_name: &'static str) -> RGArg {
let claparg = Arg::with_name(long_name)
.long(long_name)
.multiple(true);
.long(long_name);
RGArg {
claparg: claparg,
name: long_name,
@ -280,7 +280,6 @@ impl RGArg {
.long(long_name)
.value_name(value_name)
.takes_value(true)
.multiple(true)
.number_of_values(1);
RGArg {
claparg: claparg,
@ -351,11 +350,8 @@ impl RGArg {
// document it distinct for each different kind. See RGArgKind docs.
match self.kind {
RGArgKind::Positional { ref mut multiple, .. } => {
self.claparg = self.claparg.multiple(true);
*multiple = true;
}
// We don't need to modify clap's state in the following cases
// because all switches and flags always have `multiple` enabled.
RGArgKind::Switch { ref mut multiple, .. } => {
*multiple = true;
}
@ -363,6 +359,7 @@ impl RGArg {
*multiple = true;
}
}
self.claparg = self.claparg.multiple(true);
self
}