-use crate::utils::{qpath_res, snippet, span_lint_and_then, visitors::LocalUsedVisitor};
+use crate::utils::{path_to_local_id, snippet, span_lint_and_then, visitors::LocalUsedVisitor};
use if_chain::if_chain;
use rustc_errors::Applicability;
use rustc_hir as hir;
-use rustc_hir::def::Res;
use rustc_hir::BindingAnnotation;
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
if let hir::PatKind::Binding(mode, canonical_id, ident, None) = local.pat.kind;
if let hir::StmtKind::Expr(ref if_) = expr.kind;
if let hir::ExprKind::If(ref cond, ref then, ref else_) = if_.kind;
- if !LocalUsedVisitor::new(canonical_id).check_expr(cond);
+ let mut used_visitor = LocalUsedVisitor::new(cx, canonical_id);
+ if !used_visitor.check_expr(cond);
if let hir::ExprKind::Block(ref then, _) = then.kind;
if let Some(value) = check_assign(cx, canonical_id, &*then);
- if !LocalUsedVisitor::new(canonical_id).check_expr(value);
+ if !used_visitor.check_expr(value);
then {
let span = stmt.span.to(if_.span);
if let Some(expr) = block.stmts.iter().last();
if let hir::StmtKind::Semi(ref expr) = expr.kind;
if let hir::ExprKind::Assign(ref var, ref value, _) = expr.kind;
- if let hir::ExprKind::Path(ref qpath) = var.kind;
- if let Res::Local(local_id) = qpath_res(cx, qpath, var.hir_id);
- if decl == local_id;
+ if path_to_local_id(var, decl);
then {
- let mut v = LocalUsedVisitor::new(decl);
+ let mut v = LocalUsedVisitor::new(cx, decl);
if block.stmts.iter().take(block.stmts.len()-1).any(|stmt| v.check_stmt(stmt)) {
return None;