about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorflip1995 <hello@philkrones.com>2019-06-24 18:14:04 +0200
committerflip1995 <hello@philkrones.com>2019-06-24 18:14:04 +0200
commit8e087cdd98850f9bdb998ddfa6c4dfe2d4553260 (patch)
treedabe042d99665a6ea9f1ca9f3eebedb34bdff3b7 /src
parent7de6f5472812a7dde8ffba399b71a3c558cd44bf (diff)
downloadrust-8e087cdd98850f9bdb998ddfa6c4dfe2d4553260.tar.gz
rust-8e087cdd98850f9bdb998ddfa6c4dfe2d4553260.zip
Use symbols in lint tool list
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/bin/rustc.rs11
-rw-r--r--src/libsyntax/attr/mod.rs2
-rw-r--r--src/libsyntax_pos/symbol.rs1
3 files changed, 8 insertions, 6 deletions
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index a1333ff3dc7..242074fec77 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -306,14 +306,15 @@ fn main() {
     }
 
     // This is required for internal lints.
-    cmd.arg("-Zunstable-options");
     if let Some(crate_name) = args.windows(2).find(|a| &*a[0] == "--crate-name") {
         let crate_name = crate_name[1].to_string_lossy();
-        if crate_name.starts_with("rustc")
-            || crate_name.starts_with("syntax")
-            || crate_name == "arena"
-            || crate_name == "fmt_macros"
+        if crate_name != "rustc_version"
+            && (crate_name.starts_with("rustc")
+                || crate_name.starts_with("syntax")
+                || crate_name == "arena"
+                || crate_name == "fmt_macros")
         {
+            cmd.arg("-Zunstable-options");
             if stage != "0" {
                 cmd.arg("-Wrustc::internal");
             }
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs
index 08bea08c257..21e0f60a2e7 100644
--- a/src/libsyntax/attr/mod.rs
+++ b/src/libsyntax/attr/mod.rs
@@ -60,7 +60,7 @@ pub fn is_known(attr: &Attribute) -> bool {
 }
 
 pub fn is_known_lint_tool(m_item: Ident) -> bool {
-    ["clippy", "rustc"].contains(&m_item.as_str().as_ref())
+    [sym::clippy, sym::rustc].contains(&m_item.name)
 }
 
 impl NestedMetaItem {
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index 4b8535fa625..554512b23bc 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -173,6 +173,7 @@ symbols! {
         cfg_target_thread_local,
         cfg_target_vendor,
         char,
+        clippy,
         clone,
         Clone,
         clone_closures,