From 35ad982179a0c82aa12d48261bd449396a569382 Mon Sep 17 00:00:00 2001
From: Jacherr <jwc2002@outlook.com>
Date: Sun, 6 Oct 2024 20:52:18 +0100
Subject: [PATCH] refactor and move proc macro check

---
 .../src/methods/unnecessary_map_or.rs         | 26 +++++++++----------
 tests/ui/unnecessary_map_or.stderr            | 10 +++----
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/clippy_lints/src/methods/unnecessary_map_or.rs b/clippy_lints/src/methods/unnecessary_map_or.rs
index 90290a34c709..f7cf6d6c0fb5 100644
--- a/clippy_lints/src/methods/unnecessary_map_or.rs
+++ b/clippy_lints/src/methods/unnecessary_map_or.rs
@@ -2,7 +2,7 @@ use clippy_config::msrvs::{self, Msrv};
 use clippy_utils::diagnostics::span_lint_and_sugg;
 use clippy_utils::eager_or_lazy::switch_to_eager_eval;
 use clippy_utils::source::{snippet, snippet_opt};
-use clippy_utils::ty::is_type_diagnostic_item;
+use clippy_utils::ty::get_type_diagnostic_name;
 use clippy_utils::visitors::is_local_used;
 use clippy_utils::{get_parent_expr, is_from_proc_macro, path_to_local_id};
 use rustc_ast::LitKind::Bool;
@@ -42,27 +42,20 @@ pub(super) fn check<'a>(
     map: &Expr<'_>,
     msrv: &Msrv,
 ) {
-    if is_from_proc_macro(cx, expr) {
-        return;
-    }
-
     let ExprKind::Lit(def_kind) = def.kind else {
         return;
     };
 
     let recv_ty = cx.typeck_results().expr_ty(recv);
-    if !(is_type_diagnostic_item(cx, recv_ty, sym::Option) || is_type_diagnostic_item(cx, recv_ty, sym::Result)) {
-        return;
-    }
 
     let Bool(def_bool) = def_kind.node else {
         return;
     };
 
-    let variant = if is_type_diagnostic_item(cx, recv_ty, sym::Option) {
-        Variant::Some
-    } else {
-        Variant::Ok
+    let variant = match get_type_diagnostic_name(cx, recv_ty) {
+        Some(sym::Option) => Variant::Some,
+        Some(sym::Result) => Variant::Ok,
+        Some(_) | None => return,
     };
 
     let (sugg, method) = if let ExprKind::Closure(map_closure) = map.kind
@@ -94,6 +87,7 @@ pub(super) fn check<'a>(
         // since for example `Some(5).map_or(false, |x| x == 5).then(|| 1)`
         // being converted to `Some(5) == Some(5).then(|| 1)` isnt
         // the same thing
+
         let should_add_parens = get_parent_expr(cx, expr)
             .is_some_and(|expr| expr.precedence().order() > i8::try_from(AssocOp::Equal.precedence()).unwrap_or(0));
         (
@@ -104,7 +98,7 @@ pub(super) fn check<'a>(
                 snippet(cx, non_binding_location.span.source_callsite(), ".."),
                 if should_add_parens { ")" } else { "" }
             ),
-            "standard comparison",
+            "a standard comparison",
         )
     } else if !def_bool
         && msrv.meets(msrvs::OPTION_RESULT_IS_VARIANT_AND)
@@ -120,6 +114,10 @@ pub(super) fn check<'a>(
         return;
     };
 
+    if is_from_proc_macro(cx, expr) {
+        return;
+    }
+
     span_lint_and_sugg(
         cx,
         UNNECESSARY_MAP_OR,
@@ -127,6 +125,6 @@ pub(super) fn check<'a>(
         "this `map_or` is redundant",
         format!("use {method} instead"),
         sugg,
-        Applicability::MachineApplicable,
+        Applicability::MaybeIncorrect,
     );
 }
diff --git a/tests/ui/unnecessary_map_or.stderr b/tests/ui/unnecessary_map_or.stderr
index 48f487a25e81..0d943ea52cdf 100644
--- a/tests/ui/unnecessary_map_or.stderr
+++ b/tests/ui/unnecessary_map_or.stderr
@@ -2,7 +2,7 @@ error: this `map_or` is redundant
   --> tests/ui/unnecessary_map_or.rs:12:13
    |
 LL |     let _ = Some(5).map_or(false, |n| n == 5);
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use standard comparison instead: `Some(5) == Some(5)`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a standard comparison instead: `Some(5) == Some(5)`
    |
    = note: `-D clippy::unnecessary-map-or` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::unnecessary_map_or)]`
@@ -11,7 +11,7 @@ error: this `map_or` is redundant
   --> tests/ui/unnecessary_map_or.rs:13:13
    |
 LL |     let _ = Some(5).map_or(true, |n| n != 5);
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use standard comparison instead: `Some(5) != Some(5)`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a standard comparison instead: `Some(5) != Some(5)`
 
 error: this `map_or` is redundant
   --> tests/ui/unnecessary_map_or.rs:14:13
@@ -21,7 +21,7 @@ LL |       let _ = Some(5).map_or(false, |n| {
 LL | |         let _ = 1;
 LL | |         n == 5
 LL | |     });
-   | |______^ help: use standard comparison instead: `Some(5) == Some(5)`
+   | |______^ help: use a standard comparison instead: `Some(5) == Some(5)`
 
 error: this `map_or` is redundant
   --> tests/ui/unnecessary_map_or.rs:18:13
@@ -75,13 +75,13 @@ error: this `map_or` is redundant
   --> tests/ui/unnecessary_map_or.rs:27:13
    |
 LL |     let _ = Ok::<i32, i32>(5).map_or(false, |n| n == 5);
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use standard comparison instead: `Ok::<i32, i32>(5) == Ok(5)`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a standard comparison instead: `Ok::<i32, i32>(5) == Ok(5)`
 
 error: this `map_or` is redundant
   --> tests/ui/unnecessary_map_or.rs:28:13
    |
 LL |     let _ = Some(5).map_or(false, |n| n == 5).then(|| 1);
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use standard comparison instead: `(Some(5) == Some(5))`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a standard comparison instead: `(Some(5) == Some(5))`
 
 error: aborting due to 11 previous errors