Replace option.map(cond) == Some(true) with option.is_some_and(cond)

dtolnay · dtolnay · commit abf08329bbcc · 2023-11-24T09:14:09.000-08:00
diff --git a/scripts/rustc-clif.rs b/scripts/rustc-clif.rs
@@ -27,7 +27,7 @@ fn main() {
         args.push(codegen_backend_arg);
     }
     if !passed_args.iter().any(|arg| {
-        arg == "--sysroot" || arg.to_str().map(|s| s.starts_with("--sysroot=")) == Some(true)
+        arg == "--sysroot" || arg.to_str().is_some_and(|s| s.starts_with("--sysroot="))
     }) {
         args.push(OsString::from("--sysroot"));
         args.push(OsString::from(sysroot.to_str().unwrap()));
diff --git a/scripts/rustdoc-clif.rs b/scripts/rustdoc-clif.rs
@@ -27,7 +27,7 @@ fn main() {
         args.push(codegen_backend_arg);
     }
     if !passed_args.iter().any(|arg| {
-        arg == "--sysroot" || arg.to_str().map(|s| s.starts_with("--sysroot=")) == Some(true)
+        arg == "--sysroot" || arg.to_str().is_some_and(|s| s.starts_with("--sysroot="))
     }) {
         args.push(OsString::from("--sysroot"));
         args.push(OsString::from(sysroot.to_str().unwrap()));

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ fn main() {`
`27`	`27`	`args.push(codegen_backend_arg);`
`28`	`28`	`}`
`29`	`29`	`if !passed_args.iter().any(\|arg\| {`
`30`		`- arg == "--sysroot" \|\| arg.to_str().map(\|s\| s.starts_with("--sysroot=")) == Some(true)`
	`30`	`+ arg == "--sysroot" \|\| arg.to_str().is_some_and(\|s\| s.starts_with("--sysroot="))`
`31`	`31`	`}) {`
`32`	`32`	`args.push(OsString::from("--sysroot"));`
`33`	`33`	`args.push(OsString::from(sysroot.to_str().unwrap()));`