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

im(color): reduces color in error messages

Browse source 
Closes #110
This commit is contained in:
Kevin K 2015-05-06 08:14:03 -04:00
parent 05a34c8eec
commit aab44cca63
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/app.rs
View file

@ -1152,17 +1152,17 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
// Reports and error to the users screen along with an optional usage statement and quits // Reports and error to the users screen along with an optional usage statement and quits
#[cfg(not(feature = "color"))] #[cfg(not(feature = "color"))]
fn report_error(&self, msg: String, usage: bool, quit: bool, matches: Option<Vec<&str>>) { fn report_error(&self, msg: String, usage: bool, quit: bool, matches: Option<Vec<&str>>) {
println!("{}", msg); println!("{}\n", msg);
if usage { self.print_usage(true, matches); } if usage { self.print_usage(true, matches); }
if quit { self.exit(1); } if quit { self.exit(1); }
} }
#[cfg(feature = "color")] #[cfg(feature = "color")]
fn report_error(&self, msg: String, usage: bool, quit: bool, matches: Option<Vec<&str>>) { fn report_error(&self, msg: String, usage: bool, quit: bool, matches: Option<Vec<&str>>) {
println!("{}", Red.paint(&msg[..])); println!("{}\n", Red.paint(&msg[..]));
if usage { if usage {
print!("{}",Red.paint(&self.create_usage(matches)[..])); print!("{}",&self.create_usage(matches)[..]);
println!("{}",Red.paint("\nFor more information try --help")); println!("{}","\n\nFor more information try --help");
} }
if quit { self.exit(1); } if quit { self.exit(1); }
} }
@ -1384,7 +1384,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
self.report_error( self.report_error(
format!("The subcommand '{}' isn't valid\n\tDid you mean '{}' ?\n\n\ format!("The subcommand '{}' isn't valid\n\tDid you mean '{}' ?\n\n\
If you received this message in error, try \ If you received this message in error, try \
re-running with '{} -- {}'\n", re-running with '{} -- {}'",
arg, arg,
candidate_subcommand, candidate_subcommand,
self.bin_name.clone().unwrap_or(self.name.clone()), self.bin_name.clone().unwrap_or(self.name.clone()),
@ -1512,7 +1512,8 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
}; };
if should_err { if should_err {
self.report_error( self.report_error(
format!("Argument '{}' requires a value but none was supplied", o), format!("The argument '{}' requires a value but none was \
supplied", o),
true, true,
true, true,
Some(matches.args.keys().map(|k| *k).collect() ) ); Some(matches.args.keys().map(|k| *k).collect() ) );
@ -1520,19 +1521,19 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
} }
else if !o.multiple { else if !o.multiple {
self.report_error( self.report_error(
format!("Argument '{}' requires a value but none was supplied", o), format!("The argument '{}' requires a value but none was supplied", o),
true, true,
true, true,
Some(matches.args.keys().map(|k| *k).collect() ) ); Some(matches.args.keys().map(|k| *k).collect() ) );
} }
else { else {
self.report_error(format!("The following required arguments were not \ self.report_error(format!("The following required arguments were not \
supplied:\n{}", supplied:{}",
self.get_required_from(self.required.iter() self.get_required_from(self.required.iter()
.map(|s| *s) .map(|s| *s)
.collect::<HashSet<_>>()) .collect::<HashSet<_>>())
.iter() .iter()
.fold(String::new(), |acc, s| acc + &format!("\t'{}'\n",s)[..])), .fold(String::new(), |acc, s| acc + &format!("\n\t'{}'",s)[..])),
true, true,
true, true,
Some(matches.args.keys().map(|k| *k).collect())); Some(matches.args.keys().map(|k| *k).collect()));
@ -1556,12 +1557,12 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
if !self.required.is_empty() { if !self.required.is_empty() {
if self.validate_required(&matches) { if self.validate_required(&matches) {
self.report_error(format!("The following required arguments were not \ self.report_error(format!("The following required arguments were not \
supplied:\n{}", supplied:{}",
self.get_required_from(self.required.iter() self.get_required_from(self.required.iter()
.map(|s| *s) .map(|s| *s)
.collect::<HashSet<_>>()) .collect::<HashSet<_>>())
.iter() .iter()
.fold(String::new(), |acc, s| acc + &format!("\t'{}'\n",s)[..])), .fold(String::new(), |acc, s| acc + &format!("\n\t'{}'",s)[..])),
true, true,
true, true,
Some(matches.args.keys().map(|k| *k).collect())); Some(matches.args.keys().map(|k| *k).collect()));
@ -1683,8 +1684,8 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
arg = arg_vec[0]; arg = arg_vec[0];
// prevents "--config= value" typo // prevents "--config= value" typo
if arg_vec[1].len() == 0 { if arg_vec[1].len() == 0 {
self.report_error(format!("Argument --{} requires a value, but none was supplied", self.report_error(format!("The argument --{} requires a value, but none was \
arg), supplied", arg),
true, true,
true, true,
Some(matches.args.keys().map(|k| *k).collect())); Some(matches.args.keys().map(|k| *k).collect()));
@ -1705,7 +1706,7 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
if matches.args.contains_key(v.name) { if matches.args.contains_key(v.name) {
if !v.multiple { if !v.multiple {
self.report_error(format!("Argument --{} was supplied more than once, but \ self.report_error(format!("The argument --{} was supplied more than once, but \
does not support multiple values", arg), does not support multiple values", arg),
true, true,
true, true,