bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

E0516 Update error format #36108

Browse source 
- fixes #36108
- part of #35233
This commit is contained in:
Gavin Baker 2016-08-30 11:04:55 +10:00
parent 2dbf600d15
commit d53ea97bfc
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc/hir/check_attr.rs
View file

@ -56,18 +56,21 @@ impl<'a> CheckAttrVisitor<'a> {
let mut conflicting_reprs = 0;
for word in words {
let name = match word.name() {
Some(word) => word,
None => continue,
};
let message = match &*name {
let word: &str = &word.name();
let (message, label) = match word {
"C" => {
conflicting_reprs += 1;
if target != Target::Struct &&
target != Target::Union &&
target != Target::Enum {
"attribute should be applied to struct, enum or union"
("attribute should be applied to struct, enum or union",
"a struct, enum or union")
} else {
continue
}
@ -85,7 +88,8 @@ impl<'a> CheckAttrVisitor<'a> {
"simd" => {
conflicting_reprs += 1;
if target != Target::Struct {
"attribute should be applied to struct"
("attribute should be applied to struct",
"a struct")
} else {
continue
}
@ -95,15 +99,17 @@ impl<'a> CheckAttrVisitor<'a> {
"isize" | "usize" => {
conflicting_reprs += 1;
if target != Target::Enum {
"attribute should be applied to enum"
("attribute should be applied to enum",
"an enum")
} else {
continue
}
}
_ => continue,
};
span_err!(self.sess, attr.span, E0517, "{}", message);
struct_span_err!(self.sess, attr.span, E0517, "{}", message)
.span_label(attr.span, &format!("requires {}", label))
.emit();
}
if conflicting_reprs > 1 {
span_warn!(self.sess, attr.span, E0566,