Merge branch 'macro-use' into HEAD

[rust.git] / clippy_lints / src / if_not_else.rs

diff --git a/clippy_lints/src/if_not_else.rs b/clippy_lints/src/if_not_else.rs
index d7d98351647c0e3232ef01e11a7a27f8f7433276..eea83ca6b88572d8577f8f21b9d420a2b95065b1 100644 (file)
--- a/clippy_lints/src/if_not_else.rs
+++ b/clippy_lints/src/if_not_else.rs
@@ -2,9 +2,10 @@
 //! on the condition
 
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use syntax::ast::*;
 
-use utils::{in_external_macro, span_help_and_lint};
+use crate::utils::{in_external_macro, span_help_and_lint};
 
 /// **What it does:** Checks for usage of `!` or `!=` in an if condition with an
 /// else branch.
@@ -31,9 +32,9 @@
 ///     a()
 /// }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub IF_NOT_ELSE,
-    Allow,
+    pedantic,
     "`if` branches that could be swapped so no negation operation is necessary on the condition"
 }