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

refactor to add ColorizeOption

Browse source
This commit is contained in:
nate 2017-05-26 15:48:16 -07:00 committed by Kevin K
parent f400fa6e7f
commit 53e3d833f1
1 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/errors.rs
View file

@ -9,7 +9,7 @@ use std::result::Result as StdResult;
// Internal // Internal
use args::{FlagBuilder, AnyArg}; use args::{FlagBuilder, AnyArg};
use fmt; use fmt::{Colorizer,ColorizerOption, ColorWhen};
use suggestions; use suggestions;
/// Short hand for [`Result`] type /// Short hand for [`Result`] type
@ -408,17 +408,17 @@ impl Error {
pub fn argument_conflict<'a, 'b, A, O, U>(arg: &A, pub fn argument_conflict<'a, 'b, A, O, U>(arg: &A,
other: Option<O>, other: Option<O>,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where A: AnyArg<'a, 'b> + Display, where A: AnyArg<'a, 'b> + Display,
O: Into<String>, O: Into<String>,
U: Display U: Display
{ {
let mut v = vec![arg.name().to_owned()]; let mut v = vec![arg.name().to_owned()];
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The argument '{}' cannot be used with {}\n\n\ message: format!("{} The argument '{}' cannot be used with {}\n\n\
{}\n\n\ {}\n\n\
@ -444,14 +444,14 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn empty_value<'a, 'b, A, U>(arg: &A, usage: U, color: fmt::ColorWhen) -> Self pub fn empty_value<'a, 'b, A, U>(arg: &A, usage: U, color: ColorWhen) -> Self
where A: AnyArg<'a, 'b> + Display, where A: AnyArg<'a, 'b> + Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The argument '{}' requires a value but none was supplied\ message: format!("{} The argument '{}' requires a value but none was supplied\
\n\n\ \n\n\
@ -471,17 +471,17 @@ impl Error {
good_vals: &[G], good_vals: &[G],
arg: &A, arg: &A,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where B: AsRef<str>, where B: AsRef<str>,
G: AsRef<str> + Display, G: AsRef<str> + Display,
A: AnyArg<'a, 'b> + Display, A: AnyArg<'a, 'b> + Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
let suffix = let suffix =
suggestions::did_you_mean_suffix(bad_val.as_ref(), suggestions::did_you_mean_suffix(bad_val.as_ref(),
good_vals.iter(), good_vals.iter(),
@ -517,7 +517,7 @@ impl Error {
did_you_mean: D, did_you_mean: D,
name: N, name: N,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where S: Into<String>, where S: Into<String>,
D: AsRef<str> + Display, D: AsRef<str> + Display,
@ -525,10 +525,10 @@ impl Error {
U: Display U: Display
{ {
let s = subcmd.into(); let s = subcmd.into();
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The subcommand '{}' wasn't recognized\n\t\ message: format!("{} The subcommand '{}' wasn't recognized\n\t\
Did you mean '{}'?\n\n\ Did you mean '{}'?\n\n\
@ -550,15 +550,15 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn unrecognized_subcommand<S, N>(subcmd: S, name: N, color: fmt::ColorWhen) -> Self pub fn unrecognized_subcommand<S, N>(subcmd: S, name: N, color: ColorWhen) -> Self
where S: Into<String>, where S: Into<String>,
N: Display N: Display
{ {
let s = subcmd.into(); let s = subcmd.into();
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The subcommand '{}' wasn't recognized\n\n\ message: format!("{} The subcommand '{}' wasn't recognized\n\n\
{}\n\t\ {}\n\t\
@ -575,14 +575,14 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn missing_required_argument<R, U>(required: R, usage: U, color: fmt::ColorWhen) -> Self pub fn missing_required_argument<R, U>(required: R, usage: U, color: ColorWhen) -> Self
where R: Display, where R: Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The following required arguments were not provided:{}\n\n\ message: format!("{} The following required arguments were not provided:{}\n\n\
{}\n\n\ {}\n\n\
@ -597,14 +597,14 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn missing_subcommand<N, U>(name: N, usage: U, color: fmt::ColorWhen) -> Self pub fn missing_subcommand<N, U>(name: N, usage: U, color: ColorWhen) -> Self
where N: AsRef<str> + Display, where N: AsRef<str> + Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} '{}' requires a subcommand, but one was not provided\n\n\ message: format!("{} '{}' requires a subcommand, but one was not provided\n\n\
{}\n\n\ {}\n\n\
@ -620,13 +620,13 @@ impl Error {
#[doc(hidden)] #[doc(hidden)]
pub fn invalid_utf8<U>(usage: U, color: fmt::ColorWhen) -> Self pub fn invalid_utf8<U>(usage: U, color: ColorWhen) -> Self
where U: Display where U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} Invalid UTF-8 was detected in one or more arguments\n\n\ message: format!("{} Invalid UTF-8 was detected in one or more arguments\n\n\
{}\n\n\ {}\n\n\
@ -643,17 +643,17 @@ impl Error {
pub fn too_many_values<'a, 'b, V, A, U>(val: V, pub fn too_many_values<'a, 'b, V, A, U>(val: V,
arg: &A, arg: &A,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where V: AsRef<str> + Display + ToOwned, where V: AsRef<str> + Display + ToOwned,
A: AnyArg<'a, 'b> + Display, A: AnyArg<'a, 'b> + Display,
U: Display U: Display
{ {
let v = val.as_ref(); let v = val.as_ref();
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The value '{}' was provided to '{}', but it wasn't expecting \ message: format!("{} The value '{}' was provided to '{}', but it wasn't expecting \
any more values\n\n\ any more values\n\n\
@ -674,15 +674,15 @@ impl Error {
min_vals: u64, min_vals: u64,
curr_vals: usize, curr_vals: usize,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where A: AnyArg<'a, 'b> + Display, where A: AnyArg<'a, 'b> + Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The argument '{}' requires at least {} values, but only {} w{} \ message: format!("{} The argument '{}' requires at least {} values, but only {} w{} \
provided\n\n\ provided\n\n\
@ -701,13 +701,13 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn value_validation<'a, 'b, A>(arg: Option<&A>, err: String, color: fmt::ColorWhen) -> Self pub fn value_validation<'a, 'b, A>(arg: Option<&A>, err: String, color: ColorWhen) -> Self
where A: AnyArg<'a, 'b> + Display where A: AnyArg<'a, 'b> + Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} Invalid value{}: {}", message: format!("{} Invalid value{}: {}",
c.error("error:"), c.error("error:"),
@ -725,7 +725,7 @@ impl Error {
#[doc(hidden)] #[doc(hidden)]
pub fn value_validation_auto(err: String) -> Self { pub fn value_validation_auto(err: String) -> Self {
let n: Option<&FlagBuilder> = None; let n: Option<&FlagBuilder> = None;
Error::value_validation(n, err, fmt::ColorWhen::Auto) Error::value_validation(n, err, ColorWhen::Auto)
} }
#[doc(hidden)] #[doc(hidden)]
@ -734,16 +734,16 @@ impl Error {
curr_vals: usize, curr_vals: usize,
suffix: S, suffix: S,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where A: AnyArg<'a, 'b> + Display, where A: AnyArg<'a, 'b> + Display,
S: Display, S: Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The argument '{}' requires {} values, but {} w{} \ message: format!("{} The argument '{}' requires {} values, but {} w{} \
provided\n\n\ provided\n\n\
@ -762,14 +762,14 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn unexpected_multiple_usage<'a, 'b, A, U>(arg: &A, usage: U, color: fmt::ColorWhen) -> Self pub fn unexpected_multiple_usage<'a, 'b, A, U>(arg: &A, usage: U, color: ColorWhen) -> Self
where A: AnyArg<'a, 'b> + Display, where A: AnyArg<'a, 'b> + Display,
U: Display U: Display
{ {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} The argument '{}' was provided more than once, but cannot \ message: format!("{} The argument '{}' was provided more than once, but cannot \
be used multiple times\n\n\ be used multiple times\n\n\
@ -788,16 +788,16 @@ impl Error {
pub fn unknown_argument<A, U>(arg: A, pub fn unknown_argument<A, U>(arg: A,
did_you_mean: &str, did_you_mean: &str,
usage: U, usage: U,
color: fmt::ColorWhen) color: ColorWhen)
-> Self -> Self
where A: Into<String>, where A: Into<String>,
U: Display U: Display
{ {
let a = arg.into(); let a = arg.into();
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} Found argument '{}' which wasn't expected, or isn't valid in \ message: format!("{} Found argument '{}' which wasn't expected, or isn't valid in \
this context{}\n\ this context{}\n\
@ -818,11 +818,11 @@ impl Error {
} }
#[doc(hidden)] #[doc(hidden)]
pub fn io_error(e: &Error, color: fmt::ColorWhen) -> Self { pub fn io_error(e: &Error, color: ColorWhen) -> Self {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: color, when: color,
}; });
Error { Error {
message: format!("{} {}", c.error("error:"), e.description()), message: format!("{} {}", c.error("error:"), e.description()),
kind: ErrorKind::Io, kind: ErrorKind::Io,
@ -835,10 +835,10 @@ impl Error {
where A: Into<String> where A: Into<String>
{ {
let a = arg.into(); let a = arg.into();
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: fmt::ColorWhen::Auto, when: ColorWhen::Auto,
}; });
Error { Error {
message: format!("{} The argument '{}' wasn't found", message: format!("{} The argument '{}' wasn't found",
c.error("error:"), c.error("error:"),
@ -853,10 +853,10 @@ impl Error {
/// This can be used in combination with `Error::exit` to exit your program /// This can be used in combination with `Error::exit` to exit your program
/// with a custom error message. /// with a custom error message.
pub fn with_description(description: &str, kind: ErrorKind) -> Self { pub fn with_description(description: &str, kind: ErrorKind) -> Self {
let c = fmt::Colorizer { let c = Colorizer::new( ColorizerOption {
use_stderr: true, use_stderr: true,
when: fmt::ColorWhen::Auto, when: ColorWhen::Auto,
}; });
Error { Error {
message: format!("{} {}", c.error("error:"), description), message: format!("{} {}", c.error("error:"), description),
kind: kind, kind: kind,