-use crate::utils::{higher, snippet, span_lint_and_then};
+use crate::utils::{higher, qpath_res, snippet, span_lint_and_then};
use if_chain::if_chain;
+use rustc::declare_lint_pass;
use rustc::hir;
use rustc::hir::def::Res;
use rustc::hir::BindingAnnotation;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
use rustc_errors::Applicability;
+use rustc_session::declare_tool_lint;
declare_clippy_lint! {
/// **What it does:** Checks for variable declarations immediately followed by a
while let Some(stmt) = it.next() {
if_chain! {
if let Some(expr) = it.peek();
- if let hir::StmtKind::Local(ref local) = stmt.node;
- if let hir::PatKind::Binding(mode, canonical_id, ident, None) = local.pat.node;
- if let hir::StmtKind::Expr(ref if_) = expr.node;
+ if let hir::StmtKind::Local(ref local) = stmt.kind;
+ if let hir::PatKind::Binding(mode, canonical_id, ident, None) = local.pat.kind;
+ if let hir::StmtKind::Expr(ref if_) = expr.kind;
if let Some((ref cond, ref then, ref else_)) = higher::if_block(&if_);
if !used_in_expr(cx, canonical_id, cond);
- if let hir::ExprKind::Block(ref then, _) = then.node;
+ if let hir::ExprKind::Block(ref then, _) = then.kind;
if let Some(value) = check_assign(cx, canonical_id, &*then);
if !used_in_expr(cx, canonical_id, value);
then {
if has_interior_mutability { return; }
let (default_multi_stmts, default) = if let Some(ref else_) = *else_ {
- if let hir::ExprKind::Block(ref else_, _) = else_.node {
+ if let hir::ExprKind::Block(ref else_, _) = else_.kind {
if let Some(default) = check_assign(cx, canonical_id, else_) {
(else_.stmts.len() > 1, default)
} else if let Some(ref default) = local.init {
}
}
-struct UsedVisitor<'a, 'tcx: 'a> {
+struct UsedVisitor<'a, 'tcx> {
cx: &'a LateContext<'a, 'tcx>,
id: hir::HirId,
used: bool,
impl<'a, 'tcx> hir::intravisit::Visitor<'tcx> for UsedVisitor<'a, 'tcx> {
fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
if_chain! {
- if let hir::ExprKind::Path(ref qpath) = expr.node;
- if let Res::Local(local_id) = self.cx.tables.qpath_res(qpath, expr.hir_id);
+ if let hir::ExprKind::Path(ref qpath) = expr.kind;
+ if let Res::Local(local_id) = qpath_res(self.cx, qpath, expr.hir_id);
if self.id == local_id;
then {
self.used = true;
if_chain! {
if block.expr.is_none();
if let Some(expr) = block.stmts.iter().last();
- if let hir::StmtKind::Semi(ref expr) = expr.node;
- if let hir::ExprKind::Assign(ref var, ref value) = expr.node;
- if let hir::ExprKind::Path(ref qpath) = var.node;
- if let Res::Local(local_id) = cx.tables.qpath_res(qpath, var.hir_id);
+ 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;
then {
let mut v = UsedVisitor {
None
}
-fn used_in_expr<'a, 'tcx: 'a>(cx: &LateContext<'a, 'tcx>, id: hir::HirId, expr: &'tcx hir::Expr) -> bool {
+fn used_in_expr<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, id: hir::HirId, expr: &'tcx hir::Expr) -> bool {
let mut v = UsedVisitor { cx, id, used: false };
hir::intravisit::walk_expr(&mut v, expr);
v.used