Merge branch 'macro-use' into HEAD

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

diff --git a/clippy_lints/src/mutex_atomic.rs b/clippy_lints/src/mutex_atomic.rs
index 25a7118ceda5a12f0374f97d9d7c8fda29d4a33d..2448cd84d7c7008b35f510015c192f60424e9463 100644 (file)
--- a/clippy_lints/src/mutex_atomic.rs
+++ b/clippy_lints/src/mutex_atomic.rs
@@ -2,11 +2,12 @@
 //!
 //! This lint is **warn** by default
 
-use rustc::lint::{LintPass, LintArray, LateLintPass, LateContext};
+use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
+use rustc::{declare_lint, lint_array};
 use rustc::ty::{self, Ty};
 use rustc::hir::Expr;
 use syntax::ast;
-use utils::{match_type, paths, span_lint};
+use crate::utils::{match_type, paths, span_lint};
 
 /// **What it does:** Checks for usages of `Mutex<X>` where an atomic will do.
 ///
@@ -22,9 +23,9 @@
 /// ```rust
 /// let x = Mutex::new(&y);
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub MUTEX_ATOMIC,
-    Warn,
+    perf,
     "using a mutex where an atomic value could be used instead"
 }
 
@@ -42,9 +43,9 @@
 /// ```rust
 /// let x = Mutex::new(0usize);
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub MUTEX_INTEGER,
-    Allow,
+    nursery,
     "using a mutex for an integer type"
 }
 
@@ -65,12 +66,12 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
                 if let Some(atomic_name) = get_atomic_name(mutex_param) {
                     let msg = format!(
                         "Consider using an {} instead of a Mutex here. If you just want the locking \
-                                       behaviour and not the internal type, consider using Mutex<()>.",
+                         behaviour and not the internal type, consider using Mutex<()>.",
                         atomic_name
                     );
                     match mutex_param.sty {
-                        ty::TyUint(t) if t != ast::UintTy::Us => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
-                        ty::TyInt(t) if t != ast::IntTy::Is => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
+                        ty::TyUint(t) if t != ast::UintTy::Usize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
+                        ty::TyInt(t) if t != ast::IntTy::Isize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
                         _ => span_lint(cx, MUTEX_ATOMIC, expr.span, &msg),
                     };
                 }