bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

add label to unknown meta item error

Browse source
This commit is contained in:
Andy Russell 2018-06-30 15:33:59 -04:00
parent f315943970
commit 5468e12ca0
No known key found for this signature in database
GPG key ID: BE2221033EDBC374
2 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/libsyntax/attr/builtin.rs
View file

@ -20,7 +20,7 @@ use super::{list_contains_name, mark_used, MetaItemKind};
enum AttrError { enum AttrError {
MultipleItem(Name), MultipleItem(Name),
UnknownMetaItem(Name), UnknownMetaItem(Name, &'static [&'static str]),
MissingSince, MissingSince,
MissingFeature, MissingFeature,
MultipleStabilityLevels, MultipleStabilityLevels,
@ -31,8 +31,15 @@ fn handle_errors(diag: &Handler, span: Span, error: AttrError) {
match error { match error {
AttrError::MultipleItem(item) => span_err!(diag, span, E0538, AttrError::MultipleItem(item) => span_err!(diag, span, E0538,
"multiple '{}' items", item), "multiple '{}' items", item),
AttrError::UnknownMetaItem(item) => span_err!(diag, span, E0541, AttrError::UnknownMetaItem(item, expected) => {
"unknown meta item '{}'", item), let expected = expected
.iter()
.map(|name| format!("`{}`", name))
.collect::<Vec<_>>();
struct_span_err!(diag, span, E0541, "unknown meta item '{}'", item)
.span_label(span, format!("expected one of {}", expected.join(", ")))
.emit();
}
AttrError::MissingSince => span_err!(diag, span, E0542, "missing 'since'"), AttrError::MissingSince => span_err!(diag, span, E0542, "missing 'since'"),
AttrError::MissingFeature => span_err!(diag, span, E0546, "missing 'feature'"), AttrError::MissingFeature => span_err!(diag, span, E0546, "missing 'feature'"),
AttrError::MultipleStabilityLevels => span_err!(diag, span, E0544, AttrError::MultipleStabilityLevels => span_err!(diag, span, E0544,
@ -213,8 +220,11 @@ fn find_stability_generic<'a, I>(diagnostic: &Handler,
=> if !get(mi, &mut $name) { continue 'outer }, => if !get(mi, &mut $name) { continue 'outer },
)+ )+
_ => { _ => {
handle_errors(diagnostic, mi.span, let expected = &[ $( stringify!($name) ),+ ];
AttrError::UnknownMetaItem(mi.name())); handle_errors(
diagnostic,
mi.span,
AttrError::UnknownMetaItem(mi.name(), expected));
continue 'outer continue 'outer
} }
} }
@ -286,8 +296,14 @@ fn find_stability_generic<'a, I>(diagnostic: &Handler,
"reason" => if !get(mi, &mut reason) { continue 'outer }, "reason" => if !get(mi, &mut reason) { continue 'outer },
"issue" => if !get(mi, &mut issue) { continue 'outer }, "issue" => if !get(mi, &mut issue) { continue 'outer },
_ => { _ => {
handle_errors(diagnostic, meta.span, handle_errors(
AttrError::UnknownMetaItem(mi.name())); diagnostic,
meta.span,
AttrError::UnknownMetaItem(
mi.name(),
&["feature", "reason", "issue"]
),
);
continue 'outer continue 'outer
} }
} }
@ -341,8 +357,11 @@ fn find_stability_generic<'a, I>(diagnostic: &Handler,
"feature" => if !get(mi, &mut feature) { continue 'outer }, "feature" => if !get(mi, &mut feature) { continue 'outer },
"since" => if !get(mi, &mut since) { continue 'outer }, "since" => if !get(mi, &mut since) { continue 'outer },
_ => { _ => {
handle_errors(diagnostic, meta.span, handle_errors(
AttrError::UnknownMetaItem(mi.name())); diagnostic,
meta.span,
AttrError::UnknownMetaItem(mi.name(), &["since", "note"]),
);
continue 'outer continue 'outer
} }
} }
@ -520,8 +539,11 @@ fn find_deprecation_generic<'a, I>(diagnostic: &Handler,
"since" => if !get(mi, &mut since) { continue 'outer }, "since" => if !get(mi, &mut since) { continue 'outer },
"note" => if !get(mi, &mut note) { continue 'outer }, "note" => if !get(mi, &mut note) { continue 'outer },
_ => { _ => {
handle_errors(diagnostic, meta.span, handle_errors(
AttrError::UnknownMetaItem(mi.name())); diagnostic,
meta.span,
AttrError::UnknownMetaItem(mi.name(), &["since", "note"]),
);
continue 'outer continue 'outer
} }
} }

2
src/test/ui/deprecation-sanity.stderr
View file

@ -2,7 +2,7 @@ error[E0541]: unknown meta item 'reason'
--> $DIR/deprecation-sanity.rs:14:43 --> $DIR/deprecation-sanity.rs:14:43
| |
LL | #[deprecated(since = "a", note = "a", reason)] //~ ERROR unknown meta item 'reason' LL | #[deprecated(since = "a", note = "a", reason)] //~ ERROR unknown meta item 'reason'
| ^^^^^^ | ^^^^^^ expected one of `since`, `note`
error[E0551]: incorrect meta item error[E0551]: incorrect meta item
--> $DIR/deprecation-sanity.rs:17:31 --> $DIR/deprecation-sanity.rs:17:31