Auto merge of #29716 - Manishearth:repr-error, r=Gankro

r? @Gankro

2 files changed, 87 insertions, 15 deletions

diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index 361b8c53108..f4d7a318691 100644
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -2042,6 +2042,79 @@ It is not possible to use stability attributes outside of the standard library.
 Also, for now, it is not possible to write deprecation messages either.
 "##,
 
+E0517: r##"
+This error indicates that a `#[repr(..)]` attribute was placed on an unsupported
+item.
+
+Examples of erroneous code:
+
+```
+#[repr(C)]
+type Foo = u8;
+
+#[repr(packed)]
+enum Foo {Bar, Baz}
+
+#[repr(u8)]
+struct Foo {bar: bool, baz: bool}
+
+#[repr(C)]
+impl Foo {
+    ...
+}
+```
+
+ - The `#[repr(C)]` attribute can only be placed on structs and enums
+ - The `#[repr(packed)]` and `#[repr(simd)]` attributes only work on structs
+ - The `#[repr(u8)]`, `#[repr(i16)]`, etc attributes only work on enums
+
+These attributes do not work on typedefs, since typedefs are just aliases.
+
+Representations like `#[repr(u8)]`, `#[repr(i64)]` are for selecting the
+discriminant size for C-like enums (when there is no associated data, e.g. `enum
+Color {Red, Blue, Green}`), effectively setting the size of the enum to the size
+of the provided type. Such an enum can be cast to a value of the same type as
+well. In short, `#[repr(u8)]` makes the enum behave like an integer with a
+constrained set of allowed values.
+
+Only C-like enums can be cast to numerical primitives, so this attribute will
+not apply to structs.
+
+`#[repr(packed)]` reduces padding to make the struct size smaller. The
+representation of enums isn't strictly defined in Rust, and this attribute won't
+work on enums.
+
+`#[repr(simd)]` will give a struct consisting of a homogenous series of machine
+types (i.e. `u8`, `i32`, etc) a representation that permits vectorization via
+SIMD. This doesn't make much sense for enums since they don't consist of a
+single list of data.
+"##,
+
+E0518: r##"
+This error indicates that an `#[inline(..)]` attribute was incorrectly placed on
+something other than a function or method.
+
+Examples of erroneous code:
+
+```
+#[inline(always)]
+struct Foo;
+
+#[inline(never)]
+impl Foo {
+    ...
+}
+```
+
+`#[inline]` hints the compiler whether or not to attempt to inline a method or
+function. By default, the compiler does a pretty good job of figuring this out
+itself, but if you feel the need for annotations, `#[inline(always)]` and
+`#[inline(never)]` can override or force the compiler's decision.
+
+If you wish to apply this attribute to all methods in an impl, manually annotate
+each method; it is not possible to annotate the entire impl with an `#[inline]`
+attribute.
+"##,
 }
 
 
diff --git a/src/librustc/front/check_attr.rs b/src/librustc/front/check_attr.rs
index cca14f1fbf2..27785a072a6 100644
--- a/src/librustc/front/check_attr.rs
+++ b/src/librustc/front/check_attr.rs
@@ -41,9 +41,7 @@ struct CheckAttrVisitor<'a> {
 impl<'a> CheckAttrVisitor<'a> {
     fn check_inline(&self, attr: &ast::Attribute, target: Target) {
         if target != Target::Fn {
-            self.sess.span_err(
-                attr.span,
-                "attribute should be applied to function");
+            span_err!(self.sess, attr.span, E0518, "attribute should be applied to function");
         }
     }
 
@@ -56,33 +54,34 @@ impl<'a> CheckAttrVisitor<'a> {
         };
         for word in words {
             let word: &str = &word.name();
-            match word {
+            let message = match word {
                 "C" => {
                     if target != Target::Struct && target != Target::Enum {
-                        self.sess.span_err(
-                            attr.span,
-                            "attribute should be applied to struct or enum");
+                            "attribute should be applied to struct or enum"
+                    } else {
+                        continue
                     }
                 }
                 "packed" |
                 "simd" => {
                     if target != Target::Struct {
-                        self.sess.span_err(
-                            attr.span,
-                            "attribute should be applied to struct");
+                        "attribute should be applied to struct"
+                    } else {
+                        continue
                     }
                 }
                 "i8" | "u8" | "i16" | "u16" |
                 "i32" | "u32" | "i64" | "u64" |
                 "isize" | "usize" => {
                     if target != Target::Enum {
-                        self.sess.span_err(
-                            attr.span,
-                            "attribute should be applied to enum");
+                            "attribute should be applied to enum"
+                    } else {
+                        continue
                     }
                 }
-                _ => (),
-            }
+                _ => continue,
+            };
+            span_err!(self.sess, attr.span, E0517, "{}", message);
         }
     }