fix suggestion in option_map_or_none

Author: togami2864

clippy_lints/src/methods/option_map_or_none.rs

@@ -53,12 +53,12 @@ pub(super) fn check<'tcx>(
             let self_snippet = snippet(cx, recv.span, "..");
             let func_snippet = snippet(cx, map_arg.span, "..");
             let msg = "called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling \
-                       `and_then(..)` instead";
+                       `map(..)` instead";
             (
                 OPTION_MAP_OR_NONE,
                 msg,
-                "try using `and_then` instead",
-                format!("{0}.and_then({1})", self_snippet, func_snippet),
+                "try using `map` instead",
+                format!("{0}.map({1})", self_snippet, func_snippet),
             )
         } else if f_arg_is_some {
             let msg = "called `map_or(None, Some)` on a `Result` value. This can be done more directly by calling \

tests/ui/option_map_or_none.fixed

@@ -7,10 +7,10 @@ fn main() {
 
     // Check `OPTION_MAP_OR_NONE`.
     // Single line case.
-    let _ = opt.and_then(|x| Some(x + 1));
+    let _ = opt.map(|x| Some(x + 1));
     // Multi-line case.
     #[rustfmt::skip]
-    let _ = opt.and_then(|x| {
+    let _ = opt.map(|x| {
                         Some(x + 1)
                        });
 }

tests/ui/option_map_or_none.stderr

@@ -1,12 +1,12 @@
-error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `and_then(..)` instead
+error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `map(..)` instead
   --> $DIR/option_map_or_none.rs:10:13
    |
 LL |     let _ = opt.map_or(None, |x| Some(x + 1));
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try using `and_then` instead: `opt.and_then(|x| Some(x + 1))`
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try using `map` instead: `opt.map(|x| Some(x + 1))`
    |
    = note: `-D clippy::option-map-or-none` implied by `-D warnings`
 
-error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `and_then(..)` instead
+error: called `map_or(None, ..)` on an `Option` value. This can be done more directly by calling `map(..)` instead
   --> $DIR/option_map_or_none.rs:13:13
    |
 LL |       let _ = opt.map_or(None, |x| {
@@ -15,9 +15,9 @@ LL | |                         Some(x + 1)
 LL | |                        });
    | |_________________________^
    |
-help: try using `and_then` instead
+help: try using `map` instead
    |
-LL ~     let _ = opt.and_then(|x| {
+LL ~     let _ = opt.map(|x| {
 LL +                         Some(x + 1)
 LL ~                        });
    |