about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-15 12:11:16 +0000
committerbors <bors@rust-lang.org>2014-08-15 12:11:16 +0000
commit406de8d5dd07bb898c9c4db438dd35829b7a6c25 (patch)
treee83a278c39b303eb18d99911e1dc49aa9127b415
parent1d12b6d444ec083466020777be5bb9f19e9a6d3a (diff)
parent614bfbe57761a230cc22f1ac49fd764110726b5b (diff)
auto merge of #16500 : jackheizer/rust/export-name, r=alexcrichton
-rw-r--r--src/doc/rust.md2
-rw-r--r--src/librustc/lint/builtin.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md
index 518cd3a9891..564e61b9912 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -1928,6 +1928,8 @@ interpreted:
 
 ### Miscellaneous attributes
 
+- `export_name` - on statics and functions, this determines the name of the
+  exported symbol.
 - `link_section` - on statics and functions, this specifies the section of the
   object file that this item's contents will be placed into.
 - `macro_export` - export a macro for cross-crate usage.
diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index d08e2ce527f..2bb6e506bdc 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -568,6 +568,7 @@ impl LintPass for UnusedAttribute {
             // FIXME: #14406 these are processed in trans, which happens after the
             // lint pass
             "cold",
+            "export_name",
             "inline",
             "link",
             "link_name",