about summary refs log tree commit diff
diff options
context:
space:
mode:
authorflip1995 <hello@philkrones.com>2018-10-02 18:15:13 +0200
committerManish Goregaokar <manishsmail@gmail.com>2018-10-09 16:38:38 -0700
commitffe15277ff182b1981b2d46264882bca31b89d13 (patch)
treed864e65f11ada1b40f5ada1138785aa6d2a85c4f
parent6328850e6d6717f2d137274598b7c92602a01edb (diff)
downloadrust-ffe15277ff182b1981b2d46264882bca31b89d13.tar.gz
rust-ffe15277ff182b1981b2d46264882bca31b89d13.zip
Remove nightly check for tool_lints warning
-rw-r--r--src/librustc/lint/levels.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs
index bcba5c97e33..950754a07ab 100644
--- 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::{config::nightly_options, Session};
+use session::Session;
 use syntax::ast;
 use syntax::attr;
 use syntax::source_map::MultiSpan;
@@ -284,13 +284,7 @@ impl<'a> LintLevelsBuilder<'a> {
                                     "change it to",
                                     new_lint_name.to_string(),
                                     Applicability::MachineApplicable,
-                                );
-
-                                if nightly_options::is_nightly_build() {
-                                    err.emit();
-                                } else {
-                                    err.cancel();
-                                }
+                                ).emit();
 
                                 let src = LintSource::Node(Symbol::intern(&new_lint_name), li.span);
                                 for id in ids {