test: fix test errors

Author: yuxqiu

clippy_lints/src/lines_filter_map_ok.rs

@@ -96,8 +96,7 @@ fn should_lint(cx: &LateContext<'_>, args: &[Expr<'_>], method_str: &str) -> boo
                 ExprKind::Path(qpath) => cx
                     .qpath_res(qpath, fm_arg.hir_id)
                     .opt_def_id()
-                    .map(|did| match_def_path(cx, did, &paths::CORE_RESULT_OK_METHOD))
-                    .unwrap_or_default(),
+                    .is_some_and(|did| match_def_path(cx, did, &paths::CORE_RESULT_OK_METHOD)),
                 // Detect `|x| x.ok()`
                 ExprKind::Closure(Closure { body, .. }) => {
                     if let Body {

clippy_lints/src/methods/map_unwrap_or_default.rs

@@ -3,6 +3,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::ty::{expr_sig, is_type_diagnostic_item};
 use rustc_errors::Applicability;
 use rustc_lint::LateContext;
+use rustc_middle::ty::Ty;
 use rustc_span::{sym, Span};
 
 use super::MAP_UNWRAP_OR_DEFAULT;
@@ -33,7 +34,7 @@ pub(super) fn check<'tcx>(
     let map_arg_return_bool = expr_sig(cx, map_arg).is_some_and(|fn_sig| {
         fn_sig
             .output()
-            .is_some_and(|ret| ret.no_bound_vars().is_some_and(|ty| ty.is_bool()))
+            .is_some_and(|ret| ret.no_bound_vars().is_some_and(Ty::is_bool))
     });
     if !map_arg_return_bool {
         return;
@@ -62,7 +63,7 @@ pub(super) fn check<'tcx>(
                 (expr.span.with_lo(unwrap_recv.span.hi()), String::new()),
             ];
             diag.multipart_suggestion(
-                format!("use {} instead", suggest),
+                format!("use {suggest} instead"),
                 suggestion,
                 Applicability::MachineApplicable,
             );

clippy_lints/src/methods/mod.rs

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