fix: map_unwrap_or FN on references

Author: profetia

clippy_lints/src/methods/map_unwrap_or.rs

@@ -26,8 +26,9 @@ pub(super) fn check<'tcx>(
     map_span: Span,
     msrv: Msrv,
 ) {
-    let is_option = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Option);
-    let is_result = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
+    let recv_ty = cx.typeck_results().expr_ty(recv).peel_refs();
+    let is_option = is_type_diagnostic_item(cx, recv_ty, sym::Option);
+    let is_result = is_type_diagnostic_item(cx, recv_ty, sym::Result);
 
     if is_result && !msrv.meets(cx, msrvs::RESULT_MAP_OR) {
         return;

clippy_lints/src/methods/map_unwrap_or_else.rs

@@ -21,9 +21,9 @@ pub(super) fn check<'tcx>(
     unwrap_arg: &'tcx hir::Expr<'_>,
     msrv: Msrv,
 ) -> bool {
-    // lint if the caller of `map()` is an `Option` or a `Result`.
-    let is_option = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Option);
-    let is_result = is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
+    let recv_ty = cx.typeck_results().expr_ty(recv).peel_refs();
+    let is_option = is_type_diagnostic_item(cx, recv_ty, sym::Option);
+    let is_result = is_type_diagnostic_item(cx, recv_ty, sym::Result);
 
     if is_result && !msrv.meets(cx, msrvs::RESULT_MAP_OR_ELSE) {
         return false;

tests/ui/map_unwrap_or_fixable.fixed

@@ -1,6 +1,7 @@
 //@aux-build:option_helpers.rs
 
 #![warn(clippy::map_unwrap_or)]
+#![allow(clippy::unnecessary_lazy_evaluations)]
 
 #[macro_use]
 extern crate option_helpers;
@@ -67,3 +68,21 @@ fn issue15714() {
     println!("{}", r.is_ok_and(|y| y == 1));
     //~^ map_unwrap_or
 }
+
+fn issue15713() {
+    let x = &Some(3);
+    println!("{}", x.map_or(3, |y| y + 1));
+    //~^ map_unwrap_or
+
+    let x: &Result<i32, ()> = &Ok(3);
+    println!("{}", x.map_or(3, |y| y + 1));
+    //~^ map_unwrap_or
+
+    let x = &Some(3);
+    println!("{}", x.map_or_else(|| 3, |y| y + 1));
+    //~^ map_unwrap_or
+
+    let x: &Result<i32, ()> = &Ok(3);
+    println!("{}", x.map_or_else(|_| 3, |y| y + 1));
+    //~^ map_unwrap_or
+}

tests/ui/map_unwrap_or_fixable.rs

@@ -1,6 +1,7 @@
 //@aux-build:option_helpers.rs
 
 #![warn(clippy::map_unwrap_or)]
+#![allow(clippy::unnecessary_lazy_evaluations)]
 
 #[macro_use]
 extern crate option_helpers;
@@ -73,3 +74,21 @@ fn issue15714() {
     println!("{}", r.map(|y| y == 1).unwrap_or(false));
     //~^ map_unwrap_or
 }
+
+fn issue15713() {
+    let x = &Some(3);
+    println!("{}", x.map(|y| y + 1).unwrap_or(3));
+    //~^ map_unwrap_or
+
+    let x: &Result<i32, ()> = &Ok(3);
+    println!("{}", x.map(|y| y + 1).unwrap_or(3));
+    //~^ map_unwrap_or
+
+    let x = &Some(3);
+    println!("{}", x.map(|y| y + 1).unwrap_or_else(|| 3));
+    //~^ map_unwrap_or
+
+    let x: &Result<i32, ()> = &Ok(3);
+    println!("{}", x.map(|y| y + 1).unwrap_or_else(|_| 3));
+    //~^ map_unwrap_or
+}

tests/ui/map_unwrap_or_fixable.stderr

@@ -1,5 +1,5 @@
 error: called `map(<f>).unwrap_or_else(<g>)` on an `Option` value
-  --> tests/ui/map_unwrap_or_fixable.rs:16:13
+  --> tests/ui/map_unwrap_or_fixable.rs:17:13
    |
 LL |       let _ = opt.map(|x| x + 1)
    |  _____________^
@@ -11,7 +11,7 @@ LL | |         .unwrap_or_else(|| 0);
    = help: to override `-D warnings` add `#[allow(clippy::map_unwrap_or)]`
 
 error: called `map(<f>).unwrap_or_else(<g>)` on a `Result` value
-  --> tests/ui/map_unwrap_or_fixable.rs:47:13
+  --> tests/ui/map_unwrap_or_fixable.rs:48:13
    |
 LL |       let _ = res.map(|x| x + 1)
    |  _____________^
@@ -20,7 +20,7 @@ LL | |         .unwrap_or_else(|_e| 0);
    | |_______________________________^ help: try: `res.map_or_else(|_e| 0, |x| x + 1)`
 
 error: called `map(<f>).unwrap_or(<a>)` on an `Option` value
-  --> tests/ui/map_unwrap_or_fixable.rs:64:20
+  --> tests/ui/map_unwrap_or_fixable.rs:65:20
    |
 LL |     println!("{}", o.map(|y| y + 1).unwrap_or(3));
    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -32,13 +32,13 @@ LL +     println!("{}", o.map_or(3, |y| y + 1));
    |
 
 error: called `map(<f>).unwrap_or_else(<g>)` on an `Option` value
-  --> tests/ui/map_unwrap_or_fixable.rs:66:20
+  --> tests/ui/map_unwrap_or_fixable.rs:67:20
    |
 LL |     println!("{}", o.map(|y| y + 1).unwrap_or_else(|| 3));
    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `o.map_or_else(|| 3, |y| y + 1)`
 
 error: called `map(<f>).unwrap_or(<a>)` on an `Result` value
-  --> tests/ui/map_unwrap_or_fixable.rs:68:20
+  --> tests/ui/map_unwrap_or_fixable.rs:69:20
    |
 LL |     println!("{}", r.map(|y| y + 1).unwrap_or(3));
    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -50,13 +50,13 @@ LL +     println!("{}", r.map_or(3, |y| y + 1));
    |
 
 error: called `map(<f>).unwrap_or_else(<g>)` on a `Result` value
-  --> tests/ui/map_unwrap_or_fixable.rs:70:20
+  --> tests/ui/map_unwrap_or_fixable.rs:71:20
    |
 LL |     println!("{}", r.map(|y| y + 1).unwrap_or_else(|()| 3));
    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `r.map_or_else(|()| 3, |y| y + 1)`
 
 error: called `map(<f>).unwrap_or(false)` on an `Result` value
-  --> tests/ui/map_unwrap_or_fixable.rs:73:20
+  --> tests/ui/map_unwrap_or_fixable.rs:74:20
    |
 LL |     println!("{}", r.map(|y| y == 1).unwrap_or(false));
    |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -67,5 +67,41 @@ LL -     println!("{}", r.map(|y| y == 1).unwrap_or(false));
 LL +     println!("{}", r.is_ok_and(|y| y == 1));
    |
 
-error: aborting due to 7 previous errors
+error: called `map(<f>).unwrap_or(<a>)` on an `Option` value
+  --> tests/ui/map_unwrap_or_fixable.rs:80:20
+   |
+LL |     println!("{}", x.map(|y| y + 1).unwrap_or(3));
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: use `map_or(<a>, <f>)` instead
+   |
+LL -     println!("{}", x.map(|y| y + 1).unwrap_or(3));
+LL +     println!("{}", x.map_or(3, |y| y + 1));
+   |
+
+error: called `map(<f>).unwrap_or(<a>)` on an `Result` value
+  --> tests/ui/map_unwrap_or_fixable.rs:84:20
+   |
+LL |     println!("{}", x.map(|y| y + 1).unwrap_or(3));
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: use `map_or(<a>, <f>)` instead
+   |
+LL -     println!("{}", x.map(|y| y + 1).unwrap_or(3));
+LL +     println!("{}", x.map_or(3, |y| y + 1));
+   |
+
+error: called `map(<f>).unwrap_or_else(<g>)` on an `Option` value
+  --> tests/ui/map_unwrap_or_fixable.rs:88:20
+   |
+LL |     println!("{}", x.map(|y| y + 1).unwrap_or_else(|| 3));
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `x.map_or_else(|| 3, |y| y + 1)`
+
+error: called `map(<f>).unwrap_or_else(<g>)` on a `Result` value
+  --> tests/ui/map_unwrap_or_fixable.rs:92:20
+   |
+LL |     println!("{}", x.map(|y| y + 1).unwrap_or_else(|_| 3));
+   |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `x.map_or_else(|_| 3, |y| y + 1)`
+
+error: aborting due to 11 previous errors