Rollup merge of rust-lang#54713 - flip1995:tool_lints_nightly, r=Mani…

…shearth Add nightly check for tool_lints warning cc rust-lang#54358 Let's add the nightly check, just in case something prevents a stabilization until 1.31.beta.
kennytm · Oct 1, 2018 · 4433116 · 4433116
2 parents 94254d3 + e68db04
commit 4433116
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs
@@ -18,7 +18,7 @@ use lint::context::CheckLintNameResult;
 use lint::{self, Lint, LintId, Level, LintSource};
 use rustc_data_structures::stable_hasher::{HashStable, ToStableHashKey,
                                            StableHasher, StableHasherResult};
-use session::Session;
+use session::{config::nightly_options, Session};
 use syntax::ast;
 use syntax::attr;
 use syntax::source_map::MultiSpan;
@@ -299,7 +299,13 @@ impl<'a> LintLevelsBuilder<'a> {
                                     "change it to",
                                     new_lint_name.to_string(),
                                     Applicability::MachineApplicable,
-                                ).emit();
+                                );
+
+                                if nightly_options::is_nightly_build() {
+                                    err.emit();
+                                } else {
+                                    err.cancel();
+                                }
 
                                 let src = LintSource::Node(Symbol::intern(&new_lint_name), li.span);
                                 for id in ids {