From a42b7738cadb0a2751d1973c63c019f9eddecb6d Mon Sep 17 00:00:00 2001
From: Linshu Yang <linshuy2@illinois.edu>
Date: Wed, 12 Nov 2025 19:26:31 +0000
Subject: [PATCH] fix: `redundant_pattern_matching` misses `)` in suggestion
 span

---
 .../src/matches/redundant_pattern_match.rs         | 14 ++++----------
 tests/ui/redundant_pattern_matching_option.fixed   | 13 +++++++++++++
 tests/ui/redundant_pattern_matching_option.rs      | 13 +++++++++++++
 tests/ui/redundant_pattern_matching_option.stderr  | 14 +++++++++++++-
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/clippy_lints/src/matches/redundant_pattern_match.rs b/clippy_lints/src/matches/redundant_pattern_match.rs
index a0f88cf911d8..e784771ff8cb 100644
--- a/clippy_lints/src/matches/redundant_pattern_match.rs
+++ b/clippy_lints/src/matches/redundant_pattern_match.rs
@@ -1,7 +1,6 @@
 use super::REDUNDANT_PATTERN_MATCHING;
 use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
 use clippy_utils::res::{MaybeDef, MaybeTypeckRes};
-use clippy_utils::source::walk_span_to_context;
 use clippy_utils::sugg::{Sugg, make_unop};
 use clippy_utils::ty::needs_ordered_drop;
 use clippy_utils::visitors::{any_temporaries_need_ordered_drop, for_each_expr_without_closures};
@@ -25,7 +24,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
         ..
     }) = higher::WhileLet::hir(expr)
     {
-        find_method_sugg_for_if_let(cx, expr, let_pat, let_expr, "while", false);
+        find_method_sugg_for_if_let(cx, expr, let_pat, let_expr, "while", false, let_span);
         find_if_let_true(cx, let_pat, let_expr, let_span);
     }
 }
@@ -39,7 +38,7 @@ pub(super) fn check_if_let<'tcx>(
     let_span: Span,
 ) {
     find_if_let_true(cx, pat, scrutinee, let_span);
-    find_method_sugg_for_if_let(cx, expr, pat, scrutinee, "if", has_else);
+    find_method_sugg_for_if_let(cx, expr, pat, scrutinee, "if", has_else, let_span);
 }
 
 /// Looks for:
@@ -182,6 +181,7 @@ fn find_method_sugg_for_if_let<'tcx>(
     let_expr: &'tcx Expr<'_>,
     keyword: &'static str,
     has_else: bool,
+    let_span: Span,
 ) {
     // also look inside refs
     // if we have &None for example, peel it so we can detect "if let None = x"
@@ -239,15 +239,9 @@ fn find_method_sugg_for_if_let<'tcx>(
             let expr_span = expr.span;
             let ctxt = expr.span.ctxt();
 
-            // if/while let ... = ... { ... }
-            //                    ^^^
-            let Some(res_span) = walk_span_to_context(result_expr.span.source_callsite(), ctxt) else {
-                return;
-            };
-
             // if/while let ... = ... { ... }
             // ^^^^^^^^^^^^^^^^^^^^^^
-            let span = expr_span.until(res_span.shrink_to_hi());
+            let span = expr_span.until(let_span.shrink_to_hi());
 
             let mut app = if needs_drop {
                 Applicability::MaybeIncorrect
diff --git a/tests/ui/redundant_pattern_matching_option.fixed b/tests/ui/redundant_pattern_matching_option.fixed
index a54a4ce13d53..c938fa622e11 100644
--- a/tests/ui/redundant_pattern_matching_option.fixed
+++ b/tests/ui/redundant_pattern_matching_option.fixed
@@ -166,3 +166,16 @@ fn issue13902() {
         //~^ redundant_pattern_matching
     }
 }
+
+fn issue14989() {
+    macro_rules! x {
+        () => {
+            None::<i32>
+        };
+    }
+
+    if x! {}.is_some() {};
+    //~^ redundant_pattern_matching
+    while x! {}.is_some() {}
+    //~^ redundant_pattern_matching
+}
diff --git a/tests/ui/redundant_pattern_matching_option.rs b/tests/ui/redundant_pattern_matching_option.rs
index 7252fce8cce6..64846d0c396f 100644
--- a/tests/ui/redundant_pattern_matching_option.rs
+++ b/tests/ui/redundant_pattern_matching_option.rs
@@ -202,3 +202,16 @@ fn issue13902() {
         //~^ redundant_pattern_matching
     }
 }
+
+fn issue14989() {
+    macro_rules! x {
+        () => {
+            None::<i32>
+        };
+    }
+
+    if let Some(_) = (x! {}) {};
+    //~^ redundant_pattern_matching
+    while let Some(_) = (x! {}) {}
+    //~^ redundant_pattern_matching
+}
diff --git a/tests/ui/redundant_pattern_matching_option.stderr b/tests/ui/redundant_pattern_matching_option.stderr
index e5a6598898aa..109e469dff23 100644
--- a/tests/ui/redundant_pattern_matching_option.stderr
+++ b/tests/ui/redundant_pattern_matching_option.stderr
@@ -224,5 +224,17 @@ error: redundant pattern matching, consider using `is_none()`
 LL |         let _ = matches!(*p, None);
    |                 ^^^^^^^^^^^^^^^^^^ help: try: `(*p).is_none()`
 
-error: aborting due to 31 previous errors
+error: redundant pattern matching, consider using `is_some()`
+  --> tests/ui/redundant_pattern_matching_option.rs:213:12
+   |
+LL |     if let Some(_) = (x! {}) {};
+   |     -------^^^^^^^---------- help: try: `if x! {}.is_some()`
+
+error: redundant pattern matching, consider using `is_some()`
+  --> tests/ui/redundant_pattern_matching_option.rs:215:15
+   |
+LL |     while let Some(_) = (x! {}) {}
+   |     ----------^^^^^^^---------- help: try: `while x! {}.is_some()`
+
+error: aborting due to 33 previous errors