mirror of
https://github.com/astral-sh/ruff.git
synced 2025-09-28 04:45:01 +00:00
Replace .map_or(false, $closure)
with .is_some_and(closure)
(#6244)
**Summary** [Option::is_some_and](https://doc.rust-lang.org/stable/std/option/enum.Option.html#method.is_some_and) and [Result::is_ok_and](https://doc.rust-lang.org/std/result/enum.Result.html#method.is_ok_and) are new methods is rust 1.70. I find them way more readable than `.map_or(false, ...)`. The changes are `s/.map_or(false,/.is_some_and(/g`, then manually switching to `is_ok_and` where the value is a Result rather than an Option. **Test Plan** n/a^
This commit is contained in:
parent
2e1754e5fc
commit
1df7e9831b
162 changed files with 344 additions and 476 deletions
|
@ -81,7 +81,7 @@ fn find_site_packages_path(
|
|||
if let Some(preferred_dir) = candidate_dirs.iter().find(|dir| {
|
||||
dir.file_name()
|
||||
.and_then(OsStr::to_str)
|
||||
.map_or(false, |name| name == python_version.dir())
|
||||
.is_some_and(|name| name == python_version.dir())
|
||||
}) {
|
||||
debug!("Found path `{}`", preferred_dir.display());
|
||||
return Some(preferred_dir.join(SITE_PACKAGES));
|
||||
|
@ -235,7 +235,7 @@ fn build_typeshed_third_party_package_map(
|
|||
if inner_entry
|
||||
.path()
|
||||
.extension()
|
||||
.map_or(false, |extension| extension == "pyi")
|
||||
.is_some_and(|extension| extension == "pyi")
|
||||
{
|
||||
if let Some(stripped_file_name) = inner_entry
|
||||
.path()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue