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

refactor(app):dedup possible_values error-handling

Browse source 
This is done in preparation for adding suggestions.

**NOTE**: We will now always use the ...
`"\"{}\" isn't a valid value for '{}'{}"`
... format, even though in one occasion, only a ...
`"\"{}\" isn't a valid value for {}{}"`
... format was used.

Hope that's alright and not breaking the world. At least, it doesn't
break any of the existing tests.
This commit is contained in:
Sebastian Thiel 2015-05-05 16:35:23 +02:00 committed by Kevin K
parent 94dd9da1c5
commit 627ec103c9
1 changed files with 22 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/app.rs
View file

@ -1207,6 +1207,21 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
} }
} }
fn possible_values_error(&self, arg: &str, opt: &str, p_vals: &BTreeSet<&str>,
matches: &ArgMatches<'ar, 'ar>) {
self.report_error(format!("\"{}\" isn't a valid value for '{}'{}",
arg,
opt,
format!("\n\t[valid values:{}]",
p_vals.iter()
.fold(String::new(), |acc, name| {
acc + &format!(" {}",name)[..]
}))),
true,
true,
Some(matches.args.keys().map(|k| *k).collect()));
}
fn get_matches_from(&mut self, matches: &mut ArgMatches<'ar, 'ar>, it: &mut IntoIter<String>) { fn get_matches_from(&mut self, matches: &mut ArgMatches<'ar, 'ar>, it: &mut IntoIter<String>) {
self.create_help_and_version(); self.create_help_and_version();
@ -1223,18 +1238,8 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
if let Some(ref p_vals) = opt.possible_vals { if let Some(ref p_vals) = opt.possible_vals {
if !p_vals.is_empty() { if !p_vals.is_empty() {
if !p_vals.contains(arg_slice) { if !p_vals.contains(arg_slice) {
self.report_error( self.possible_values_error(arg_slice, &opt.to_string(),
format!("\"{}\" isn't a valid value for {}{}", p_vals, matches);
arg_slice,
opt,
format!("\n\t[valid values:{}]\n",
p_vals.iter()
.fold(String::new(), |acc, name| {
acc + &format!(" {}",name)[..]
}))),
true,
true,
Some(matches.args.keys().map(|k| *k).collect()));
} }
} }
} }
@ -1362,17 +1367,8 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
if let Some(ref p_vals) = p.possible_vals { if let Some(ref p_vals) = p.possible_vals {
if !p_vals.is_empty() { if !p_vals.is_empty() {
if !p_vals.contains(arg_slice) { if !p_vals.contains(arg_slice) {
self.report_error(format!("\"{}\" isn't a valid value for '{}'{}", self.possible_values_error(arg_slice, &p.to_string(),
arg_slice, p_vals, matches);
p,
format!("\n\t[valid values:{}]",
p_vals.iter()
.fold(String::new(), |acc, name| {
acc + &format!(" {}",name)[..]
}))),
true,
true,
Some(matches.args.keys().map(|k| *k).collect()));
} }
} }
} }
@ -1658,18 +1654,9 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
if let Some(ref p_vals) = v.possible_vals { if let Some(ref p_vals) = v.possible_vals {
if let Some(ref av) = arg_val { if let Some(ref av) = arg_val {
if !p_vals.contains(&av[..]) { if !p_vals.contains(&av[..]) {
self.report_error(format!("\"{}\" isn't a valid value for '{}'{}", self.possible_values_error(
arg_val.clone().unwrap_or(arg.to_owned()), arg_val.as_ref().map(|v| &**v).unwrap_or(arg),
v, &v.to_string(), p_vals, matches);
format!("\n\t[valid values:{}]",
p_vals.iter()
.fold(String::new(), |acc, name| {
acc + &format!(" {}",name)[..]
}))
),
true,
true,
Some(matches.args.keys().map(|k| *k).collect()));
} }
} }
} }