//! 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! {
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Mutex {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
let ty = cx.tables.expr_ty(expr);
- if let ty::Adt(_, subst) = ty.sty {
+ if let ty::Adt(_, subst) = ty.kind {
if match_type(cx, ty, &paths::MUTEX) {
let mutex_param = subst.type_at(0);
if let Some(atomic_name) = get_atomic_name(mutex_param) {
behaviour and not the internal type, consider using Mutex<()>.",
atomic_name
);
- match mutex_param.sty {
+ match mutex_param.kind {
ty::Uint(t) if t != ast::UintTy::Usize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
ty::Int(t) if t != ast::IntTy::Isize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
_ => span_lint(cx, MUTEX_ATOMIC, expr.span, &msg),
}
}
-fn get_atomic_name(ty: Ty<'_>) -> Option<(&'static str)> {
- match ty.sty {
+fn get_atomic_name(ty: Ty<'_>) -> Option<&'static str> {
+ match ty.kind {
ty::Bool => Some("AtomicBool"),
ty::Uint(_) => Some("AtomicUsize"),
ty::Int(_) => Some("AtomicIsize"),