suggest is_some_and instead of map_or in case_sensitive_file_extension_comparions (rust-lang#14358)

samueltardieu · web-flow · commit 9d78426b0dae · 2025-03-25T14:47:56.000Z
close rust-lang#14357 changelog: [`case_sensitive_file_extension_comparisons`]: suggest `is_some_and` to suppress other lint warnings
diff --git a/clippy_lints/src/methods/case_sensitive_file_extension_comparisons.rs b/clippy_lints/src/methods/case_sensitive_file_extension_comparisons.rs
@@ -1,4 +1,5 @@
 use clippy_utils::diagnostics::span_lint_and_then;
+use clippy_utils::msrvs::{self, Msrv};
 use clippy_utils::source::{SpanRangeExt, indent_of, reindent_multiline};
 use clippy_utils::ty::is_type_lang_item;
 use rustc_ast::ast::LitKind;
@@ -16,6 +17,7 @@ pub(super) fn check<'tcx>(
     call_span: Span,
     recv: &'tcx Expr<'_>,
     arg: &'tcx Expr<'_>,
+    msrv: Msrv,
 ) {
     if let ExprKind::MethodCall(path_segment, ..) = recv.kind {
         if matches!(
@@ -58,11 +60,15 @@ pub(super) fn check<'tcx>(
 
                     let suggestion_source = reindent_multiline(
                         &format!(
-                            "std::path::Path::new({})
+                            "std::path::Path::new({recv_source})
                                 .extension()
-                                .map_or(false, |ext| ext.eq_ignore_ascii_case(\"{}\"))",
-                            recv_source,
-                            ext_str.strip_prefix('.').unwrap()
+                                .{}|ext| ext.eq_ignore_ascii_case(\"{}\"))",
+                            if msrv.meets(cx, msrvs::OPTION_RESULT_IS_VARIANT_AND) {
+                                "is_some_and("
+                            } else {
+                                "map_or(false, "
+                            },
+                            ext_str.strip_prefix('.').unwrap(),
                         ),
                         true,
                         Some(indent_of(cx, call_span).unwrap_or(0) + 4),
diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs
@@ -4992,7 +4992,7 @@ impl Methods {
                 },
                 ("ends_with", [arg]) => {
                     if let ExprKind::MethodCall(.., span) = expr.kind {
-                        case_sensitive_file_extension_comparisons::check(cx, expr, span, recv, arg);
+                        case_sensitive_file_extension_comparisons::check(cx, expr, span, recv, arg, self.msrv);
                     }
                     path_ends_with_ext::check(cx, recv, arg, expr, self.msrv, &self.allowed_dotfiles);
                 },
diff --git a/tests/ui/case_sensitive_file_extension_comparisons.fixed b/tests/ui/case_sensitive_file_extension_comparisons.fixed
@@ -1,5 +1,4 @@
 #![warn(clippy::case_sensitive_file_extension_comparisons)]
-#![allow(clippy::unnecessary_map_or)]
 
 use std::string::String;
 
@@ -13,26 +12,26 @@ impl TestStruct {
 fn is_rust_file(filename: &str) -> bool {
     std::path::Path::new(filename)
         .extension()
-        .map_or(false, |ext| ext.eq_ignore_ascii_case("rs"))
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("rs"))
     //~^ case_sensitive_file_extension_comparisons
 }
 
 fn main() {
     // std::string::String and &str should trigger the lint failure with .ext12
     let _ = std::path::Path::new(&String::new())
         .extension()
-        .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("ext12"));
     //~^ case_sensitive_file_extension_comparisons
     let _ = std::path::Path::new("str")
         .extension()
-        .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("ext12"));
     //~^ case_sensitive_file_extension_comparisons
 
     // The fixup should preserve the indentation level
     {
         let _ = std::path::Path::new("str")
             .extension()
-            .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+            .is_some_and(|ext| ext.eq_ignore_ascii_case("ext12"));
         //~^ case_sensitive_file_extension_comparisons
     }
 
@@ -42,11 +41,11 @@ fn main() {
     // std::string::String and &str should trigger the lint failure with .EXT12
     let _ = std::path::Path::new(&String::new())
         .extension()
-        .map_or(false, |ext| ext.eq_ignore_ascii_case("EXT12"));
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("EXT12"));
     //~^ case_sensitive_file_extension_comparisons
     let _ = std::path::Path::new("str")
         .extension()
-        .map_or(false, |ext| ext.eq_ignore_ascii_case("EXT12"));
+        .is_some_and(|ext| ext.eq_ignore_ascii_case("EXT12"));
     //~^ case_sensitive_file_extension_comparisons
 
     // Should not trigger the lint failure because of the calls to to_lowercase and to_uppercase
@@ -76,3 +75,11 @@ fn main() {
     let _ = "str".ends_with(".123");
     TestStruct {}.ends_with(".123");
 }
+
+#[clippy::msrv = "1.69"]
+fn msrv_check() {
+    let _ = std::path::Path::new(&String::new())
+        .extension()
+        .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+    //~^ case_sensitive_file_extension_comparisons
+}
diff --git a/tests/ui/case_sensitive_file_extension_comparisons.rs b/tests/ui/case_sensitive_file_extension_comparisons.rs
@@ -1,5 +1,4 @@
 #![warn(clippy::case_sensitive_file_extension_comparisons)]
-#![allow(clippy::unnecessary_map_or)]
 
 use std::string::String;
 
@@ -64,3 +63,9 @@ fn main() {
     let _ = "str".ends_with(".123");
     TestStruct {}.ends_with(".123");
 }
+
+#[clippy::msrv = "1.69"]
+fn msrv_check() {
+    let _ = String::new().ends_with(".ext12");
+    //~^ case_sensitive_file_extension_comparisons
+}
diff --git a/tests/ui/case_sensitive_file_extension_comparisons.stderr b/tests/ui/case_sensitive_file_extension_comparisons.stderr
@@ -1,5 +1,5 @@
 error: case-sensitive file extension comparison
-  --> tests/ui/case_sensitive_file_extension_comparisons.rs:14:5
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:13:5
    |
 LL |     filename.ends_with(".rs")
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -11,11 +11,11 @@ help: use std::path::Path
    |
 LL ~     std::path::Path::new(filename)
 LL +         .extension()
-LL +         .map_or(false, |ext| ext.eq_ignore_ascii_case("rs"))
+LL +         .is_some_and(|ext| ext.eq_ignore_ascii_case("rs"))
    |
 
 error: case-sensitive file extension comparison
-  --> tests/ui/case_sensitive_file_extension_comparisons.rs:20:13
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:19:13
    |
 LL |     let _ = String::new().ends_with(".ext12");
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -25,11 +25,11 @@ help: use std::path::Path
    |
 LL ~     let _ = std::path::Path::new(&String::new())
 LL +         .extension()
-LL ~         .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+LL ~         .is_some_and(|ext| ext.eq_ignore_ascii_case("ext12"));
    |
 
 error: case-sensitive file extension comparison
-  --> tests/ui/case_sensitive_file_extension_comparisons.rs:22:13
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:21:13
    |
 LL |     let _ = "str".ends_with(".ext12");
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -39,11 +39,11 @@ help: use std::path::Path
    |
 LL ~     let _ = std::path::Path::new("str")
 LL +         .extension()
-LL ~         .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+LL ~         .is_some_and(|ext| ext.eq_ignore_ascii_case("ext12"));
    |
 
 error: case-sensitive file extension comparison
-  --> tests/ui/case_sensitive_file_extension_comparisons.rs:27:17
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:26:17
    |
 LL |         let _ = "str".ends_with(".ext12");
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -53,11 +53,11 @@ help: use std::path::Path
    |
 LL ~         let _ = std::path::Path::new("str")
 LL +             .extension()
-LL ~             .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
+LL ~             .is_some_and(|ext| ext.eq_ignore_ascii_case("ext12"));
    |
 
 error: case-sensitive file extension comparison
-  --> tests/ui/case_sensitive_file_extension_comparisons.rs:35:13
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:34:13
    |
 LL |     let _ = String::new().ends_with(".EXT12");
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -67,11 +67,11 @@ help: use std::path::Path
    |
 LL ~     let _ = std::path::Path::new(&String::new())
 LL +         .extension()
-LL ~         .map_or(false, |ext| ext.eq_ignore_ascii_case("EXT12"));
+LL ~         .is_some_and(|ext| ext.eq_ignore_ascii_case("EXT12"));
    |
 
 error: case-sensitive file extension comparison
-  --> tests/ui/case_sensitive_file_extension_comparisons.rs:37:13
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:36:13
    |
 LL |     let _ = "str".ends_with(".EXT12");
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -81,8 +81,22 @@ help: use std::path::Path
    |
 LL ~     let _ = std::path::Path::new("str")
 LL +         .extension()
-LL ~         .map_or(false, |ext| ext.eq_ignore_ascii_case("EXT12"));
+LL ~         .is_some_and(|ext| ext.eq_ignore_ascii_case("EXT12"));
+   |
+
+error: case-sensitive file extension comparison
+  --> tests/ui/case_sensitive_file_extension_comparisons.rs:69:13
+   |
+LL |     let _ = String::new().ends_with(".ext12");
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: consider using a case-insensitive comparison instead
+help: use std::path::Path
+   |
+LL ~     let _ = std::path::Path::new(&String::new())
+LL +         .extension()
+LL ~         .map_or(false, |ext| ext.eq_ignore_ascii_case("ext12"));
    |
 
-error: aborting due to 6 previous errors
+error: aborting due to 7 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -4992,7 +4992,7 @@ impl Methods {`
`4992`	`4992`	`},`
`4993`	`4993`	`("ends_with", [arg]) => {`
`4994`	`4994`	`if let ExprKind::MethodCall(.., span) = expr.kind {`
`4995`		`- case_sensitive_file_extension_comparisons::check(cx, expr, span, recv, arg);`
	`4995`	`+ case_sensitive_file_extension_comparisons::check(cx, expr, span, recv, arg, self.msrv);`
`4996`	`4996`	`}`
`4997`	`4997`	`path_ends_with_ext::check(cx, recv, arg, expr, self.msrv, &self.allowed_dotfiles);`
`4998`	`4998`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error: case-sensitive file extension comparison`
`2`		`- --> tests/ui/case_sensitive_file_extension_comparisons.rs:14:5`
	`2`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:13:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| filename.ends_with(".rs")`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -11,11 +11,11 @@ help: use std::path::Path`
`11`	`11`	`\|`
`12`	`12`	`LL ~ std::path::Path::new(filename)`
`13`	`13`	`LL + .extension()`
`14`		`-LL + .map_or(false, \|ext\| ext.eq_ignore_ascii_case("rs"))`
	`14`	`+LL + .is_some_and(\|ext\| ext.eq_ignore_ascii_case("rs"))`
`15`	`15`	`\|`
`16`	`16`
`17`	`17`	`error: case-sensitive file extension comparison`
`18`		`- --> tests/ui/case_sensitive_file_extension_comparisons.rs:20:13`
	`18`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:19:13`
`19`	`19`	`\|`
`20`	`20`	`LL \| let _ = String::new().ends_with(".ext12");`
`21`	`21`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -25,11 +25,11 @@ help: use std::path::Path`
`25`	`25`	`\|`
`26`	`26`	`LL ~ let _ = std::path::Path::new(&String::new())`
`27`	`27`	`LL + .extension()`
`28`		`-LL ~ .map_or(false, \|ext\| ext.eq_ignore_ascii_case("ext12"));`
	`28`	`+LL ~ .is_some_and(\|ext\| ext.eq_ignore_ascii_case("ext12"));`
`29`	`29`	`\|`
`30`	`30`
`31`	`31`	`error: case-sensitive file extension comparison`
`32`		`- --> tests/ui/case_sensitive_file_extension_comparisons.rs:22:13`
	`32`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:21:13`
`33`	`33`	`\|`
`34`	`34`	`LL \| let _ = "str".ends_with(".ext12");`
`35`	`35`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -39,11 +39,11 @@ help: use std::path::Path`
`39`	`39`	`\|`
`40`	`40`	`LL ~ let _ = std::path::Path::new("str")`
`41`	`41`	`LL + .extension()`
`42`		`-LL ~ .map_or(false, \|ext\| ext.eq_ignore_ascii_case("ext12"));`
	`42`	`+LL ~ .is_some_and(\|ext\| ext.eq_ignore_ascii_case("ext12"));`
`43`	`43`	`\|`
`44`	`44`
`45`	`45`	`error: case-sensitive file extension comparison`
`46`		`- --> tests/ui/case_sensitive_file_extension_comparisons.rs:27:17`
	`46`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:26:17`
`47`	`47`	`\|`
`48`	`48`	`LL \| let _ = "str".ends_with(".ext12");`
`49`	`49`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -53,11 +53,11 @@ help: use std::path::Path`
`53`	`53`	`\|`
`54`	`54`	`LL ~ let _ = std::path::Path::new("str")`
`55`	`55`	`LL + .extension()`
`56`		`-LL ~ .map_or(false, \|ext\| ext.eq_ignore_ascii_case("ext12"));`
	`56`	`+LL ~ .is_some_and(\|ext\| ext.eq_ignore_ascii_case("ext12"));`
`57`	`57`	`\|`
`58`	`58`
`59`	`59`	`error: case-sensitive file extension comparison`
`60`		`- --> tests/ui/case_sensitive_file_extension_comparisons.rs:35:13`
	`60`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:34:13`
`61`	`61`	`\|`
`62`	`62`	`LL \| let _ = String::new().ends_with(".EXT12");`
`63`	`63`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -67,11 +67,11 @@ help: use std::path::Path`
`67`	`67`	`\|`
`68`	`68`	`LL ~ let _ = std::path::Path::new(&String::new())`
`69`	`69`	`LL + .extension()`
`70`		`-LL ~ .map_or(false, \|ext\| ext.eq_ignore_ascii_case("EXT12"));`
	`70`	`+LL ~ .is_some_and(\|ext\| ext.eq_ignore_ascii_case("EXT12"));`
`71`	`71`	`\|`
`72`	`72`
`73`	`73`	`error: case-sensitive file extension comparison`
`74`		`- --> tests/ui/case_sensitive_file_extension_comparisons.rs:37:13`
	`74`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:36:13`
`75`	`75`	`\|`
`76`	`76`	`LL \| let _ = "str".ends_with(".EXT12");`
`77`	`77`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -81,8 +81,22 @@ help: use std::path::Path`
`81`	`81`	`\|`
`82`	`82`	`LL ~ let _ = std::path::Path::new("str")`
`83`	`83`	`LL + .extension()`
`84`		`-LL ~ .map_or(false, \|ext\| ext.eq_ignore_ascii_case("EXT12"));`
	`84`	`+LL ~ .is_some_and(\|ext\| ext.eq_ignore_ascii_case("EXT12"));`
	`85`	`+ \|`
	`86`	`+`
	`87`	`+error: case-sensitive file extension comparison`
	`88`	`+ --> tests/ui/case_sensitive_file_extension_comparisons.rs:69:13`
	`89`	`+ \|`
	`90`	`+LL \| let _ = String::new().ends_with(".ext12");`
	`91`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`92`	`+ \|`
	`93`	`+ = help: consider using a case-insensitive comparison instead`
	`94`	`+help: use std::path::Path`
	`95`	`+ \|`
	`96`	`+LL ~ let _ = std::path::Path::new(&String::new())`
	`97`	`+LL + .extension()`
	`98`	`+LL ~ .map_or(false, \|ext\| ext.eq_ignore_ascii_case("ext12"));`
`85`	`99`	`\|`
`86`	`100`
`87`		`-error: aborting due to 6 previous errors`
	`101`	`+error: aborting due to 7 previous errors`
`88`	`102`