chore

Author: tamaroning

clippy_lints/src/lib.rs

@@ -857,7 +857,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
     store.register_late_pass(move || Box::new(borrow_as_ptr::BorrowAsPtr::new(msrv)));
     store.register_late_pass(move || Box::new(manual_bits::ManualBits::new(msrv)));
     store.register_late_pass(|| Box::new(default_union_representation::DefaultUnionRepresentation));
-    store.register_late_pass(|| Box::new(map_then_identity_transformer::MapThenIdentityTransformer));
     store.register_late_pass(|| Box::new(dbg_macro::DbgMacro));
     let cargo_ignore_publish = conf.cargo_ignore_publish;
     store.register_late_pass(move || {

clippy_lints/src/methods/mod.rs

@@ -2346,7 +2346,7 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
             ("add" | "offset" | "sub" | "wrapping_offset" | "wrapping_add" | "wrapping_sub", [_arg]) => {
                 zst_offset::check(cx, expr, recv);
             },
-            (name @ ("all" | "any" | "find_map" | "position"), [arg]) => {
+            (name @ ("all" | "any" | "position"), [arg]) => {
                 if let Some((name2 @ "map", [_, arg2], span2)) = method_call(recv) {
                     map_then_identity_transformer::check(cx, span2, name2, arg2, name, arg);
                 }
@@ -2404,8 +2404,13 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
                     }
                 }
             },
-            ("find_map", [arg]) => {
-                unnecessary_filter_map::check(cx, expr, arg, name);
+            (name @ "find_map", [arg]) => {
+                let triggered = unnecessary_filter_map::check(cx, expr, arg, name);
+                if !triggered {
+                    if let Some((name2 @ "map", [_, arg2], span2)) = method_call(recv) {
+                        map_then_identity_transformer::check(cx, span2, name2, arg2, name, arg);
+                    }
+                }
             },
             (name @ "flat_map", [arg]) => {
                 let triggered = flat_map_identity::check(cx, expr, arg, span);

clippy_lints/src/methods/unnecessary_filter_map.rs

@@ -43,9 +43,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, arg: &hir::Expr<
                     {
                         if name == "filter_map" { "filter" } else { "find" }
                     },
-                    _ => {
-                        return false
-                    },
+                    _ => return false,
                 }
             } else {
                 return false;