user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix shadow_reuse false negative for if let bindings

Browse source
This commit is contained in:
Elliot Bobrow 2021-12-24 13:20:40 -08:00
parent 8529b2a056
commit 1b67aa74bd
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
clippy_lints/src/shadow.rs
View file

@ -220,14 +220,14 @@ fn is_self_shadow(cx: &LateContext<'_>, pat: &Pat<'_>, mut expr: &Expr<'_>, hir_
}
}
/// Finds the "init" expression for a pattern: `let <pat> = <init>;` or
/// Finds the "init" expression for a pattern: `let <pat> = <init>;` (or `if let`) or
/// `match <init> { .., <pat> => .., .. }`
fn find_init<'tcx>(cx: &LateContext<'tcx>, hir_id: HirId) -> Option<&'tcx Expr<'tcx>> {
for (_, node) in cx.tcx.hir().parent_iter(hir_id) {
let init = match node {
Node::Arm(_) | Node::Pat(_) => continue,
Node::Expr(expr) => match expr.kind {
ExprKind::Match(e, _, _) => Some(e),
ExprKind::Match(e, _, _) | ExprKind::Let(_, e, _) => Some(e),
_ => None,
},
Node::Local(local) => local.init,