---

yaml
---
r: 179759
b: refs/heads/auto
c: b6f55ef
h: refs/heads/master
i:
  179757: abde1c1
  179755: 080647d
  179751: ebb313c
  179743: 3077abe
v: v3

Author: richo

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 73d5d89567ef155dc12ee7d7ed61e206e43bf74e
+refs/heads/auto: b6f55efd5b21b2132dafa85c112b339ba498bc7c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/lint/builtin.rs

@@ -2107,7 +2107,10 @@ impl LintPass for InvalidNoMangleItems {
             },
             ast::ItemConst(..) => {
                 if attr::contains_name(it.attrs.as_slice(), "no_mangle") {
-                    let msg = "const items should never be #[no_mangle]";
+                    // Const items do not refer to a particular location in memory, and therefore
+                    // don't have anything to attach a symbol to
+                    let msg = "const items should never be #[no_mangle], consider instead using \
+                        `pub static`";
                     cx.span_lint(NO_MANGLE_CONST_ITEMS, it.span, msg);
                 }
             }