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

fix(derive): Fix typo in error messages

Browse source
This commit is contained in:
Ed Page 2022-06-02 14:53:18 -05:00
parent e5f2911603
commit cccc88bcc2
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
clap_derive/src/attrs.rs
View file

@ -64,10 +64,10 @@ impl Attrs {
res.push_attrs(attrs);
res.push_doc_comment(attrs, "about");
if let Some(parser) = res.value_parser.as_ref() {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
parser.span(),
"`value_parse` attribute is only allowed on fields"
value_parser.span(),
"`value_parser` attribute is only allowed on fields"
);
}
if let Some(parser) = res.parser.as_ref() {
@ -104,10 +104,10 @@ impl Attrs {
match &*res.kind {
Kind::Flatten => {
if let Some(parser) = res.value_parser.as_ref() {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
parser.span(),
"`value_parse` attribute is only allowed flattened entry"
value_parser.span(),
"`value_parser` attribute is not allowed for flattened entry"
);
}
if let Some(parser) = res.parser.as_ref() {
@ -130,10 +130,10 @@ impl Attrs {
Kind::ExternalSubcommand => (),
Kind::Subcommand(_) => {
if let Some(parser) = res.value_parser.as_ref() {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
parser.span(),
"`value_parse` attribute is only allowed for subcommand"
value_parser.span(),
"`value_parser` attribute is not allowed for subcommand"
);
}
if let Some(parser) = res.parser.as_ref() {
@ -204,10 +204,10 @@ impl Attrs {
res.push_attrs(&variant.attrs);
res.push_doc_comment(&variant.attrs, "help");
if let Some(parser) = res.value_parser.as_ref() {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
parser.span(),
"`value_parse` attribute is only allowed on fields"
value_parser.span(),
"`value_parser` attribute is only allowed on fields"
);
}
if let Some(parser) = res.parser.as_ref() {
@ -244,10 +244,10 @@ impl Attrs {
match &*res.kind {
Kind::Flatten => {
if let Some(parser) = res.value_parser.as_ref() {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
parser.span(),
"`value_parse` attribute is not allowed for flattened entry"
value_parser.span(),
"`value_parser` attribute is not allowed for flattened entry"
);
}
if let Some(parser) = res.parser.as_ref() {
@ -274,10 +274,10 @@ impl Attrs {
}
Kind::Subcommand(_) => {
if let Some(parser) = res.value_parser.as_ref() {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
parser.span(),
"`value_parse` attribute is not allowed for subcommand"
value_parser.span(),
"`value_parser` attribute is not allowed for subcommand"
);
}
if let Some(parser) = res.parser.as_ref() {
@ -330,7 +330,7 @@ impl Attrs {
if let Some(value_parser) = res.value_parser.as_ref() {
abort!(
value_parser.span(),
"`value_parse` attribute conflicts with `parse` attribute"
"`value_parser` attribute conflicts with `parse` attribute"
);
}
match *ty {

2
tests/derive_ui/parse_with_value_parser.stderr
View file

@ -1,4 +1,4 @@
error: `value_parse` attribute conflicts with `parse` attribute
error: `value_parser` attribute conflicts with `parse` attribute
--> tests/derive_ui/parse_with_value_parser.rs:14:29
|
14 | #[clap(parse(from_str), value_parser = clap::value_parser!(String))]