Fix ice

clippy_lints/src/redundant_locals.rs

@@ -62,7 +62,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantLocals {
  if let Res::Local(binding_id) = cx.qpath_res(&qpath, expr.hir_id);
  if let Node::Pat(binding_pat) = cx.tcx.hir().get(binding_id);
  // the previous binding has the same mutability
- if find_binding(binding_pat, ident).unwrap().1 == mutability;
+ if find_binding(binding_pat, ident).is_some_and(|bind| bind.1 == mutability);
  // the local does not change the effect of assignments to the binding. see #11290
  if !affects_assignments(cx, mutability, binding_id, local.hir_id);
  // the local does not affect the code's drop behavior

tests/ui/redundant_locals.rs

@@ -117,6 +117,14 @@ fn macros() {
  let x = 1;
  let x = x;
  }
+
+ let x = 10;
+ macro_rules! rebind_outer_macro {
+ ($x:ident) => {
+ let x = x;
+ };
+ }
+ rebind_outer_macro!(y);
 }
 
 struct WithDrop(usize);

tests/ui/redundant_locals.stderr

@@ -157,13 +157,13 @@ LL | let x = 1;
  | ^
 
 error: redundant redefinition of a binding `a`
- --> $DIR/redundant_locals.rs:144:5
+ --> $DIR/redundant_locals.rs:152:5
  |
 LL | let a = a;
  | ^^^^^^^^^^
  |
 help: `a` is initially defined here
- --> $DIR/redundant_locals.rs:142:9
+ --> $DIR/redundant_locals.rs:150:9
  |
 LL | let a = WithoutDrop(1);
  | ^