---

yaml
---
r: 180154
b: refs/heads/tmp
c: b6f55ef
h: refs/heads/master
v: v3

Author: richo

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 73d5d89567ef155dc12ee7d7ed61e206e43bf74e
+refs/heads/tmp: b6f55efd5b21b2132dafa85c112b339ba498bc7c

branches/tmp/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);
                 }
             }