Auto merge of #4938 - flip1995:rustup, r=flip1995

[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 d4194b0ca4137ddae533fa620517cbc5252fbd29..89865bbaa99e29138d8604c3933853e22c9a2da6 100644 (file)
--- a/clippy_lints/src/mutex_atomic.rs
+++ b/clippy_lints/src/mutex_atomic.rs
@@ -3,10 +3,11 @@
 //! This lint is **warn** by default
 
 use crate::utils::{match_type, paths, span_lint};
+use rustc::declare_lint_pass;
 use rustc::hir::Expr;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::{self, Ty};
-use rustc::{declare_lint_pass, declare_tool_lint};
+use rustc_session::declare_tool_lint;
 use syntax::ast;
 
 declare_clippy_lint! {
@@ -77,7 +78,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
     }
 }
 
-fn get_atomic_name(ty: Ty<'_>) -> Option<(&'static str)> {
+fn get_atomic_name(ty: Ty<'_>) -> Option<&'static str> {
     match ty.kind {
         ty::Bool => Some("AtomicBool"),
         ty::Uint(_) => Some("AtomicUsize"),