From 8e087cdd98850f9bdb998ddfa6c4dfe2d4553260 Mon Sep 17 00:00:00 2001 From: flip1995 Date: Mon, 24 Jun 2019 18:14:04 +0200 Subject: [PATCH] Use symbols in lint tool list --- src/bootstrap/bin/rustc.rs | 11 ++++++----- src/libsyntax/attr/mod.rs | 2 +- src/libsyntax_pos/symbol.rs | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index a1333ff3dc70..242074fec779 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 08bea08c2574..21e0f60a2e7e 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 4b8535fa625b..554512b23bc5 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,