]> git.lizzy.rs Git - rust.git/commitdiff
Remove nightly check for tool_lints warning
authorflip1995 <hello@philkrones.com>
Tue, 2 Oct 2018 16:15:13 +0000 (18:15 +0200)
committerManish Goregaokar <manishsmail@gmail.com>
Tue, 9 Oct 2018 23:38:38 +0000 (16:38 -0700)
src/librustc/lint/levels.rs

index bcba5c97e3317054f80a02e9b89050cc3280f85f..950754a07ab09787b94e05db5ca8b381a2e9ae29 100644 (file)
@@ -18,7 +18,7 @@
 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 @@ pub fn push(&mut self, attrs: &[ast::Attribute]) -> BuilderPush {
                                     "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 {