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:
@@ -422,10 +422,10 @@ impl<'input> CanOmitOptionalParenthesesVisitor<'input> {
|
||||
// Only use the layout if the first or last expression has parentheses of some sort.
|
||||
let first_parenthesized = self
|
||||
.first
|
||||
.map_or(false, |first| has_parentheses(first, self.source));
|
||||
.is_some_and(|first| has_parentheses(first, self.source));
|
||||
let last_parenthesized = self
|
||||
.last
|
||||
.map_or(false, |last| has_parentheses(last, self.source));
|
||||
.is_some_and(|last| has_parentheses(last, self.source));
|
||||
first_parenthesized || last_parenthesized
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user