mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #15960 - dtolnay-contrib:issomeand, r=lnicola

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

Extracted from https://github.com/rust-lang/rust/pull/118253.
This commit is contained in:
bors 2023-11-24 17:14:28 +00:00
commit 34cffbf1d7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ide-assists/src/handlers/toggle_ignore.rs
View File

@ -55,7 +55,7 @@ pub(crate) fn toggle_ignore(acc: &mut Assists, ctx: &AssistContext<'_>) -> Optio
} }
fn has_ignore_attribute(fn_def: &ast::Fn) -> Option<ast::Attr> { fn has_ignore_attribute(fn_def: &ast::Fn) -> Option<ast::Attr> {
fn_def.attrs().find(|attr| attr.path().map(|it| it.syntax().text() == "ignore") == Some(true)) fn_def.attrs().find(|attr| attr.path().is_some_and(|it| it.syntax().text() == "ignore"))
} }
#[cfg(test)] #[cfg(test)]

2
crates/ide/src/extend_selection.rs
View File

@ -108,7 +108,7 @@ fn try_extend_selection(
let node = shallowest_node(&node); let node = shallowest_node(&node);
if node.parent().map(|n| list_kinds.contains(&n.kind())) == Some(true) { if node.parent().is_some_and(|n| list_kinds.contains(&n.kind())) {
if let Some(range) = extend_list_item(&node) { if let Some(range) = extend_list_item(&node) {
return Some(range); return Some(range);
} }

2
crates/rust-analyzer/tests/slow-tests/tidy.rs
View File

@ -316,7 +316,7 @@ fn check_trailing_ws(path: &Path, text: &str) {
return; return;
} }
for (line_number, line) in text.lines().enumerate() { for (line_number, line) in text.lines().enumerate() {
if line.chars().last().map(char::is_whitespace) == Some(true) { if line.chars().last().is_some_and(char::is_whitespace) {
panic!("Trailing whitespace in {} at line {}", path.display(), line_number + 1) panic!("Trailing whitespace in {} at line {}", path.display(), line_number + 1)
} }
} }