fix bugs

Author: tamaroning

clippy_lints/src/methods/map_then_identity_transformer.rs

@@ -40,7 +40,8 @@ pub(super) fn check<'tcx>(
     )
 }
 
-// In a given closure `|.., x| y`, examine if `x` is referenced just exactly once in `y`.
+// On a given closure `|.., x| y`, checks if `x` is referenced just exactly once in `y` and returns
+// the span of `x`
 fn refd_param_span<'tcx>(cx: &LateContext<'tcx>, clos_body_id: &BodyId) -> Option<Span> {
     if_chain! {
         let clos_body = cx.tcx.hir().body(*clos_body_id);

clippy_lints/src/methods/mod.rs

@@ -2288,7 +2288,7 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
                 zst_offset::check(cx, expr, recv);
             },
             (name @ ("all" | "any" | "find" | "find_map" | "position"), [arg]) => {
-                if let Some((name2 @ ("flat_map" | "filter_map" | "map"), [_, arg2], span2)) = method_call(recv) {
+                if let Some((name2 @ "map", [_, arg2], span2)) = method_call(recv) {
                     map_then_identity_transformer::check(cx, span2, name2, arg2, name, arg);
                 }
             },
@@ -2334,14 +2334,14 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
                 extend_with_drain::check(cx, expr, recv, arg);
             },
             (name @ "filter_map", [arg]) => {
-                if let Some((name2 @ ("flat_map" | "filter_map" | "map"), [_, arg2], span2)) = method_call(recv) {
+                if let Some((name2 @ "map", [_, arg2], span2)) = method_call(recv) {
                     map_then_identity_transformer::check(cx, span2, name2, arg2, name, arg);
                 }
                 unnecessary_filter_map::check(cx, expr, arg);
                 filter_map_identity::check(cx, expr, arg, span);
             },
             (name @ "flat_map", [arg]) => {
-                if let Some((name2 @ ("flat_map" | "filter_map" | "map"), [_, arg2], span2)) = method_call(recv) {
+                if let Some((name2 @ "map", [_, arg2], span2)) = method_call(recv) {
                     map_then_identity_transformer::check(cx, span2, name2, arg2, name, arg);
                 }
                 flat_map_identity::check(cx, expr, arg, span);
@@ -2353,7 +2353,7 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
                 _ => {},
             },
             (name @ "fold", [init, acc]) => {
-                if let Some((name2 @ ("flat_map" | "filter_map" | "map"), [_, arg2], span2)) = method_call(recv) {
+                if let Some((name2 @ "map", [_, arg2], span2)) = method_call(recv) {
                     map_then_identity_transformer::check(cx, span2, name2, arg2, name, acc);
                 }
                 unnecessary_fold::check(cx, expr, init, acc, span);
@@ -2383,7 +2383,7 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
                             filter_map::check(cx, expr, recv2, f_arg, span2, recv, m_arg, span, false);
                         },
                         ("find", [f_arg]) => filter_map::check(cx, expr, recv2, f_arg, span2, recv, m_arg, span, true),
-                        (name2 @ ("flat_map" | "filter_map" | "map"), [_, arg2]) => {
+                        (name2 @ "map", [arg2]) => {
                             map_then_identity_transformer::check(cx, span2, name2, arg2, name, m_arg)
                         },
                         _ => {},