From b28ca32db22d5e2ed34db556c6fd50a5fc2d679c Mon Sep 17 00:00:00 2001 From: Alan Du Date: Mon, 3 Jun 2019 10:27:51 -0400 Subject: Fix clippy::or_fun_call --- crates/ra_assists/src/auto_import.rs | 4 ++-- crates/ra_assists/src/change_visibility.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_assists/src') diff --git a/crates/ra_assists/src/auto_import.rs b/crates/ra_assists/src/auto_import.rs index 1566cf179..9617beb5c 100644 --- a/crates/ra_assists/src/auto_import.rs +++ b/crates/ra_assists/src/auto_import.rs @@ -334,7 +334,7 @@ fn best_action_for_target<'b, 'a: 'b>( .filter_map(ast::UseItem::use_tree) .map(|u| walk_use_tree_for_best_action(&mut storage, None, u, target)) .fold(None, |best, a| { - best.and_then(|best| Some(*ImportAction::better(&best, &a))).or(Some(a)) + best.and_then(|best| Some(*ImportAction::better(&best, &a))).or_else(|| Some(a)) }); match best_action { @@ -347,7 +347,7 @@ fn best_action_for_target<'b, 'a: 'b>( let anchor = container .children() .find(|n| n.range().start() < anchor.range().start()) - .or(Some(anchor)); + .or_else(|| Some(anchor)); return ImportAction::add_new_use(anchor, false); } diff --git a/crates/ra_assists/src/change_visibility.rs b/crates/ra_assists/src/change_visibility.rs index 620f534b5..4eb24d27f 100644 --- a/crates/ra_assists/src/change_visibility.rs +++ b/crates/ra_assists/src/change_visibility.rs @@ -59,7 +59,7 @@ fn vis_offset(node: &SyntaxNode) -> TextUnit { }) .next() .map(|it| it.range().start()) - .unwrap_or(node.range().start()) + .unwrap_or_else(|| node.range().start()) } fn change_vis(mut ctx: AssistCtx, vis: &ast::Visibility) -> Option { -- cgit v1.2.3