apply comments

Author: Centri3

CHANGELOG.md

@@ -5110,7 +5110,7 @@ Released 2018-09-13
 [`redundant_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_else
 [`redundant_feature_names`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_feature_names
 [`redundant_field_names`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_field_names
-[`redundant_guard`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_guard
+[`redundant_guards`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_guards
 [`redundant_pattern`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern
 [`redundant_pattern_matching`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern_matching
 [`redundant_pub_crate`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pub_crate

clippy_lints/src/declared_lints.rs

@@ -301,7 +301,7 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
     crate::matches::MATCH_WILDCARD_FOR_SINGLE_VARIANTS_INFO,
     crate::matches::MATCH_WILD_ERR_ARM_INFO,
     crate::matches::NEEDLESS_MATCH_INFO,
-    crate::matches::REDUNDANT_GUARD_INFO,
+    crate::matches::REDUNDANT_GUARDS_INFO,
     crate::matches::REDUNDANT_PATTERN_MATCHING_INFO,
     crate::matches::REST_PAT_IN_FULLY_BOUND_STRUCTS_INFO,
     crate::matches::SIGNIFICANT_DROP_IN_SCRUTINEE_INFO,

clippy_lints/src/matches/mod.rs

@@ -16,7 +16,7 @@ mod match_wild_enum;
 mod match_wild_err_arm;
 mod needless_match;
 mod overlapping_arms;
-mod redundant_guard;
+mod redundant_guards;
 mod redundant_pattern_match;
 mod rest_pat_in_fully_bound_struct;
 mod significant_drop_in_scrutinee;
@@ -953,7 +953,7 @@ declare_clippy_lint! {
     /// }
     /// ```
     #[clippy::version = "1.72.0"]
-    pub REDUNDANT_GUARD,
+    pub REDUNDANT_GUARDS,
     complexity,
     "checks for unnecessary guards in match expressions"
 }
@@ -1000,7 +1000,7 @@ impl_lint_pass!(Matches => [
     TRY_ERR,
     MANUAL_MAP,
     MANUAL_FILTER,
-    REDUNDANT_GUARD,
+    REDUNDANT_GUARDS,
 ]);
 
 impl<'tcx> LateLintPass<'tcx> for Matches {
@@ -1048,7 +1048,7 @@ impl<'tcx> LateLintPass<'tcx> for Matches {
                     needless_match::check_match(cx, ex, arms, expr);
                     match_on_vec_items::check(cx, ex);
                     match_str_case_mismatch::check(cx, ex, arms);
-                    redundant_guard::check(cx, arms);
+                    redundant_guards::check(cx, arms);
 
                     if !in_constant(cx, expr.hir_id) {
                         manual_unwrap_or::check(cx, expr, ex, arms);

clippy_lints/src/matches/redundant_guard.rs renamed to clippy_lints/src/matches/redundant_guards.rs

@@ -1,18 +1,18 @@
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::source::snippet_with_applicability;
-use clippy_utils::visitors::for_each_expr;
+use clippy_utils::visitors::{for_each_expr, is_local_used};
 use rustc_errors::Applicability;
 use rustc_hir::def::{DefKind, Res};
-use rustc_hir::{Arm, BinOpKind, Expr, ExprKind, Guard, HirId, MatchSource, Node, Pat, PatField, PatKind};
+use rustc_hir::{Arm, BinOpKind, Expr, ExprKind, Guard, MatchSource, Node, Pat, PatField, PatKind};
 use rustc_lint::LateContext;
 use rustc_span::symbol::Ident;
 use rustc_span::Span;
 use std::borrow::Cow;
 use std::ops::ControlFlow;
 
-use super::REDUNDANT_GUARD;
+use super::REDUNDANT_GUARDS;
 
-pub(super) fn check(cx: &LateContext<'_>, arms: &[Arm<'_>]) {
+pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, arms: &'tcx [Arm<'tcx>]) {
     for outer_arm in arms {
         let mut app = Applicability::MaybeIncorrect;
         let Some(guard) = outer_arm.guard else {
@@ -37,7 +37,7 @@ pub(super) fn check(cx: &LateContext<'_>, arms: &[Arm<'_>]) {
             ) = if_expr.kind
             && let Some((pat_binding, field_name)) = get_pat_binding(cx, scrutinee, outer_arm)
         {
-            emit_redundant_guard(
+            emit_redundant_guards(
                 cx,
                 outer_arm,
                 if_expr.span,
@@ -53,7 +53,7 @@ pub(super) fn check(cx: &LateContext<'_>, arms: &[Arm<'_>]) {
             && let pat = let_expr.pat
             && let Some((pat_binding, field_name)) = get_pat_binding(cx, let_expr.init, outer_arm)
         {
-            emit_redundant_guard(
+            emit_redundant_guards(
                 cx,
                 outer_arm,
                 let_expr.span,
@@ -78,7 +78,7 @@ pub(super) fn check(cx: &LateContext<'_>, arms: &[Arm<'_>]) {
             // This isn't necessary in the other two checks, as they must be a pattern already.
             && cx.typeck_results().expr_ty(local) == cx.typeck_results().expr_ty(pat)
         {
-            emit_redundant_guard(
+            emit_redundant_guards(
                 cx,
                 outer_arm,
                 if_expr.span,
@@ -103,21 +103,34 @@ fn remove_binding(
     (pat_start, pat_end)
 }
 
-fn get_pat_binding(cx: &LateContext<'_>, guard_expr: &Expr<'_>, outer_arm: &Arm<'_>) -> Option<(Span, Option<Ident>)> {
+fn get_pat_binding<'tcx>(
+    cx: &LateContext<'tcx>,
+    guard_expr: &Expr<'_>,
+    outer_arm: &Arm<'tcx>,
+) -> Option<(Span, Option<Ident>)> {
     if let ExprKind::Path(qpath) = guard_expr.kind
         && let res = cx.qpath_res(&qpath, guard_expr.hir_id)
-        && let Res::Local(hir_id) = res
-        && local_came_from_and_not_used(cx, &res, outer_arm.pat.hir_id, outer_arm.body)
+        && let Res::Local(local) = res
+        && !is_local_used(cx, outer_arm.body, local)
     {
-        return cx.tcx.hir().res_span(res).map(|span| {
-            (
-                span,
-                match cx.tcx.hir().get_parent(hir_id) {
-                    Node::PatField(PatField { ident, .. }) => Some(*ident),
-                    _ => None,
-                },
-            )
+        let mut is_from_pat = false;
+        outer_arm.pat.each_binding(|_, hir_id, _, _| {
+            if hir_id == local {
+                is_from_pat = true;
+            }
         });
+
+        if is_from_pat {
+            return cx.tcx.hir().res_span(res).map(|span| {
+                (
+                    span,
+                    match cx.tcx.hir().get_parent(local) {
+                        Node::PatField(PatField { ident, .. }) => Some(*ident),
+                        _ => None,
+                    },
+                )
+            });
+        }
     }
 
     None
@@ -140,29 +153,8 @@ fn get_guard(cx: &LateContext<'_>, guard: Option<Guard<'_>>, app: &mut Applicabi
     )
 }
 
-fn local_came_from_and_not_used(cx: &LateContext<'_>, local: &Res, target: HirId, body: &Expr<'_>) -> bool {
-    if let Res::Local(local) = local
-        && cx.tcx.hir().parent_iter(*local).any(|(p, _)| p == target)
-        && for_each_expr(body, |expr| {
-            if let ExprKind::Path(qpath) = expr.kind
-                && let Res::Local(local_ref) = cx.qpath_res(&qpath, expr.hir_id)
-                && *local == local_ref
-            {
-                return ControlFlow::Break(());
-            }
-
-            ControlFlow::Continue(())
-        })
-        .is_none()
-    {
-        return true;
-    }
-
-    false
-}
-
 #[expect(clippy::too_many_arguments)]
-fn emit_redundant_guard(
+fn emit_redundant_guards(
     cx: &LateContext<'_>,
     outer_arm: &Arm<'_>,
     guard_span: Span,
@@ -177,18 +169,26 @@ fn emit_redundant_guard(
 
     span_lint_and_then(
         cx,
-        REDUNDANT_GUARD,
+        REDUNDANT_GUARDS,
         guard_span.source_callsite(),
         "redundant guard",
         |diag| {
-            diag.span_suggestion(
-                outer_arm.span.with_hi(guard_span.source_callsite().hi()),
+            diag.multipart_suggestion_verbose(
                 "try",
-                format!(
-                    "{pat_start}{}{binding_replacement}{pat_end}{}",
-                    field_name.map_or_else(|| Cow::Borrowed(""), |i| format!("{}: ", i.as_str()).into()),
-                    get_guard(cx, inner_guard, app),
-                ),
+                vec![
+                    (
+                        guard_span.source_callsite().with_lo(outer_arm.pat.span.hi()),
+                        String::new(),
+                    ),
+                    (
+                        outer_arm.pat.span,
+                        format!(
+                            "{pat_start}{}{binding_replacement}{pat_end}{}",
+                            field_name.map_or_else(|| Cow::Borrowed(""), |i| format!("{}: ", i.as_str()).into()),
+                            get_guard(cx, inner_guard, app),
+                        ),
+                    ),
+                ],
                 *app,
             );
         },

tests/ui/match_expr_like_matches_macro.fixed

@@ -6,7 +6,7 @@
     dead_code,
     clippy::equatable_if_let,
     clippy::needless_borrowed_reference,
-    clippy::redundant_guard
+    clippy::redundant_guards
 )]
 
 fn main() {

tests/ui/match_expr_like_matches_macro.rs

@@ -6,7 +6,7 @@
     dead_code,
     clippy::equatable_if_let,
     clippy::needless_borrowed_reference,
-    clippy::redundant_guard
+    clippy::redundant_guards
 )]
 
 fn main() {

tests/ui/redundant_guard.stderr

@@ -2,7 +2,7 @@
 //@aux-build:proc_macros.rs
 #![feature(if_let_guard)]
 #![allow(clippy::no_effect, unused)]
-#![warn(clippy::redundant_guard)]
+#![warn(clippy::redundant_guards)]
 
 #[macro_use]
 extern crate proc_macros;
@@ -89,6 +89,13 @@ fn f(s: Option<std::ffi::OsString>) {
     }
 }
 
+fn h(v: Option<u32>) {
+    match v {
+        Some(0) => ..,
+        _ => ..,
+    };
+}
+
 struct S {
     a: usize,
 }

tests/ui/redundant_guard.fixed renamed to tests/ui/redundant_guards.fixed

@@ -2,7 +2,7 @@
 //@aux-build:proc_macros.rs
 #![feature(if_let_guard)]
 #![allow(clippy::no_effect, unused)]
-#![warn(clippy::redundant_guard)]
+#![warn(clippy::redundant_guards)]
 
 #[macro_use]
 extern crate proc_macros;
@@ -89,6 +89,13 @@ fn f(s: Option<std::ffi::OsString>) {
     }
 }
 
+fn h(v: Option<u32>) {
+    match v {
+        x if matches!(x, Some(0)) => ..,
+        _ => ..,
+    };
+}
+
 struct S {
     a: usize,
 }