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

refactor(error): Share template across kinds

Browse source
This commit is contained in:
Ed Page 2022-02-04 10:03:05 -06:00
parent 630e7097fc
commit 9759f2f1ea
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/error/mod.rs
View file

@ -720,12 +720,12 @@ impl Error {
if let Some(message) = self.inner.message.as_ref() {
message.formatted()
} else {
let mut c = Colorizer::new(self.use_stderr(), self.inner.color_when);
start_error(&mut c);
match self.kind() {
ErrorKind::ArgumentConflict => {
let mut c = Colorizer::new(self.use_stderr(), self.inner.color_when);
start_error(&mut c);
let invalid = self.get_context(ContextKind::InvalidArg);
let valid = self.get_context(ContextKind::ValidArg);
match (invalid, valid) {
@ -756,21 +756,8 @@ impl Error {
c.none(self.kind().as_str().unwrap());
}
}
let usage = self.get_context(ContextKind::Usage);
if let Some(ContextValue::Value(usage)) = usage {
put_usage(&mut c, usage);
}
try_help(&mut c, self.inner.help_flag);
Cow::Owned(c)
}
ErrorKind::EmptyValue => {
let mut c = Colorizer::new(self.use_stderr(), self.inner.color_when);
start_error(&mut c);
let invalid = self.get_context(ContextKind::InvalidArg);
match invalid {
Some(ContextValue::Value(invalid)) => {
@ -795,15 +782,6 @@ impl Error {
}
c.none("]");
}
let usage = self.get_context(ContextKind::Usage);
if let Some(ContextValue::Value(usage)) = usage {
put_usage(&mut c, usage);
}
try_help(&mut c, self.inner.help_flag);
Cow::Owned(c)
}
ErrorKind::InvalidValue
| ErrorKind::UnknownArgument
@ -825,8 +803,6 @@ impl Error {
| ErrorKind::ArgumentNotFound
| ErrorKind::Io
| ErrorKind::Format => {
let mut c = Colorizer::new(true, ColorChoice::Never);
start_error(&mut c);
if let Some(msg) = self.kind().as_str() {
c.none(msg.to_owned());
} else if let Some(source) = self.inner.source.as_ref() {
@ -834,9 +810,17 @@ impl Error {
} else {
c.none("Unknown cause");
}
Cow::Owned(c)
}
}
let usage = self.get_context(ContextKind::Usage);
if let Some(ContextValue::Value(usage)) = usage {
put_usage(&mut c, usage);
}
try_help(&mut c, self.inner.help_flag);
Cow::Owned(c)
}
}