rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix clippy::or_fun_call

Browse Source
This commit is contained in:
Alan Du
2019-06-03 10:27:51 -04:00
parent 40424d4222
commit b28ca32db2
12 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_ide_api/src/completion/complete_pattern.rs
View File

@@ -10,7 +10,7 @@ pub(super) fn complete_pattern(acc: &mut Completions, ctx: &CompletionContext) {
let names = ctx.analyzer.all_names(ctx.db);
for (name, res) in names.into_iter() {
let r = res.as_ref();
let def = match r.take_types().or(r.take_values()) {
let def = match r.take_types().or_else(|| r.take_values()) {
Some(hir::Resolution::Def(def)) => def,
_ => continue,
};

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

@@ -95,7 +95,7 @@ fn extend_single_word_in_comment_or_string(
}
let start_idx = before.rfind(non_word_char)? as u32;
let end_idx = after.find(non_word_char).unwrap_or(after.len()) as u32;
let end_idx = after.find(non_word_char).unwrap_or_else(|| after.len()) as u32;
let from: TextUnit = (start_idx + 1).into();
let to: TextUnit = (cursor_position + end_idx).into();