fix: use expr_ty(expr)

Author: yuxqiu

clippy_lints/src/methods/manual_is_variant_and.rs

@@ -4,8 +4,6 @@ use clippy_utils::source::snippet;
 use clippy_utils::ty::is_type_diagnostic_item;
 use rustc_errors::Applicability;
 use rustc_lint::LateContext;
-use rustc_middle::ty;
-use rustc_middle::ty::Ty;
 use rustc_span::{sym, Span};
 
 use super::MANUAL_IS_VARIANT_AND;
@@ -16,7 +14,6 @@ pub(super) fn check<'tcx>(
     map_recv: &'tcx rustc_hir::Expr<'_>,
     map_arg: &'tcx rustc_hir::Expr<'_>,
     map_span: Span,
-    unwrap_recv: &'tcx rustc_hir::Expr<'_>,
     msrv: &Msrv,
 ) {
     // Don't lint if:
@@ -34,13 +31,7 @@ pub(super) fn check<'tcx>(
     }
 
     // 3. the caller of `unwrap_or_default` is neither `Option<bool>` nor `Result<bool, _>`
-    // - we don't need to check the type of AdtDef here as we know from 2 that it must be either
-    //   `Option` or `Result`.
-    let map_arg_return_bool = match cx.typeck_results().expr_ty(unwrap_recv).kind() {
-        ty::Adt(_, args) => args.first().and_then(|garg| garg.as_type()).is_some_and(Ty::is_bool),
-        _ => false,
-    };
-    if !map_arg_return_bool {
+    if !cx.typeck_results().expr_ty(expr).is_bool() {
         return;
     }
 

clippy_lints/src/methods/mod.rs

@@ -4622,7 +4622,7 @@ impl Methods {
                 },
                 ("unwrap_or_default", []) => {
                     if let Some(("map", m_recv, [arg], span, _)) = method_call(recv) {
-                        manual_is_variant_and::check(cx, expr, m_recv, arg, span, recv, &self.msrv);
+                        manual_is_variant_and::check(cx, expr, m_recv, arg, span, &self.msrv);
                     }
                     unnecessary_literal_unwrap::check(cx, expr, recv, name, args);
                 },