test: add more tests

Author: yuxqiu

tests/ui/map_unwrap_or_default.fixed

@@ -1,5 +1,9 @@
+//@aux-build:option_helpers.rs
 #![warn(clippy::map_unwrap_or_default)]
 
+#[macro_use]
+extern crate option_helpers;
+
 #[rustfmt::skip]
 fn option_methods() {
     let opt = Some(1);
@@ -18,6 +22,10 @@ fn option_methods() {
 
     // won't fix because the return type of the closure is not `bool`
     let _ = opt.map(|x| x + 1).unwrap_or_default();
+
+    let opt2 = Some('a');
+    let _ = opt2.is_some_and(char::is_alphanumeric); // should lint
+    let _ = opt_map!(opt2, |x| x == 'a').unwrap_or_default(); // should not lint
 }
 
 #[rustfmt::skip]
@@ -33,6 +41,10 @@ fn result_methods() {
 
     // won't fix because the return type of the closure is not `bool`
     let _ = res.map(|x| x + 1).unwrap_or_default();
+
+    let res2: Result<char, ()> = Ok('a');
+    let _ = res2.is_ok_and(char::is_alphanumeric); // should lint
+    let _ = opt_map!(res2, |x| x == 'a').unwrap_or_default(); // should not lint
 }
 
 fn main() {

tests/ui/map_unwrap_or_default.rs

@@ -1,5 +1,9 @@
+//@aux-build:option_helpers.rs
 #![warn(clippy::map_unwrap_or_default)]
 
+#[macro_use]
+extern crate option_helpers;
+
 #[rustfmt::skip]
 fn option_methods() {
     let opt = Some(1);
@@ -21,6 +25,10 @@ fn option_methods() {
 
     // won't fix because the return type of the closure is not `bool`
     let _ = opt.map(|x| x + 1).unwrap_or_default();
+
+    let opt2 = Some('a');
+    let _ = opt2.map(char::is_alphanumeric).unwrap_or_default(); // should lint
+    let _ = opt_map!(opt2, |x| x == 'a').unwrap_or_default(); // should not lint
 }
 
 #[rustfmt::skip]
@@ -37,6 +45,10 @@ fn result_methods() {
 
     // won't fix because the return type of the closure is not `bool`
     let _ = res.map(|x| x + 1).unwrap_or_default();
+
+    let res2: Result<char, ()> = Ok('a');
+    let _ = res2.map(char::is_alphanumeric).unwrap_or_default(); // should lint
+    let _ = opt_map!(res2, |x| x == 'a').unwrap_or_default(); // should not lint
 }
 
 fn main() {

tests/ui/map_unwrap_or_default.stderr

@@ -1,5 +1,5 @@
 error: called `map(<f>).unwrap_or_default()` on an `Option` value
-  --> $DIR/map_unwrap_or_default.rs:9:17
+  --> $DIR/map_unwrap_or_default.rs:13:17
    |
 LL |       let _ = opt.map(|x| x > 1)
    |  _________________^
@@ -16,7 +16,7 @@ LL +     let _ = opt.is_some_and(|x| x > 1);
    |
 
 error: called `map(<f>).unwrap_or_default()` on an `Option` value
-  --> $DIR/map_unwrap_or_default.rs:13:17
+  --> $DIR/map_unwrap_or_default.rs:17:17
    |
 LL |       let _ = opt.map(|x| {
    |  _________________^
@@ -34,7 +34,7 @@ LL ~     );
    |
 
 error: called `map(<f>).unwrap_or_default()` on an `Option` value
-  --> $DIR/map_unwrap_or_default.rs:17:17
+  --> $DIR/map_unwrap_or_default.rs:21:17
    |
 LL |     let _ = opt.map(|x| x > 1).unwrap_or_default();
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -46,7 +46,7 @@ LL +     let _ = opt.is_some_and(|x| x > 1);
    |
 
 error: called `map(<f>).unwrap_or_default()` on an `Option` value
-  --> $DIR/map_unwrap_or_default.rs:19:10
+  --> $DIR/map_unwrap_or_default.rs:23:10
    |
 LL |           .map(|x| x > 1)
    |  __________^
@@ -59,8 +59,20 @@ LL -         .map(|x| x > 1)
 LL +         .is_some_and(|x| x > 1);
    |
 
+error: called `map(<f>).unwrap_or_default()` on an `Option` value
+  --> $DIR/map_unwrap_or_default.rs:30:18
+   |
+LL |     let _ = opt2.map(char::is_alphanumeric).unwrap_or_default(); // should lint
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: use is_some_and instead
+   |
+LL -     let _ = opt2.map(char::is_alphanumeric).unwrap_or_default(); // should lint
+LL +     let _ = opt2.is_some_and(char::is_alphanumeric); // should lint
+   |
+
 error: called `map(<f>).unwrap_or_default()` on a `Result` value
-  --> $DIR/map_unwrap_or_default.rs:31:17
+  --> $DIR/map_unwrap_or_default.rs:39:17
    |
 LL |       let _ = res.map(|x| {
    |  _________________^
@@ -78,7 +90,7 @@ LL ~     );
    |
 
 error: called `map(<f>).unwrap_or_default()` on a `Result` value
-  --> $DIR/map_unwrap_or_default.rs:35:17
+  --> $DIR/map_unwrap_or_default.rs:43:17
    |
 LL |       let _ = res.map(|x| x > 1)
    |  _________________^
@@ -91,5 +103,17 @@ LL -     let _ = res.map(|x| x > 1)
 LL +     let _ = res.is_ok_and(|x| x > 1);
    |
 
-error: aborting due to 6 previous errors
+error: called `map(<f>).unwrap_or_default()` on a `Result` value
+  --> $DIR/map_unwrap_or_default.rs:50:18
+   |
+LL |     let _ = res2.map(char::is_alphanumeric).unwrap_or_default(); // should lint
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: use is_ok_and instead
+   |
+LL -     let _ = res2.map(char::is_alphanumeric).unwrap_or_default(); // should lint
+LL +     let _ = res2.is_ok_and(char::is_alphanumeric); // should lint
+   |
+
+error: aborting due to 8 previous errors