From e75e2ae5b6b6b1364368ceb3d4081b6508b2f001 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Sun, 28 Jun 2020 04:02:03 +0300 Subject: Simlify with matches!() --- crates/ra_assists/src/handlers/merge_match_arms.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'crates/ra_assists/src/handlers/merge_match_arms.rs') diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs index ca04ec671..53c2c130f 100644 --- a/crates/ra_assists/src/handlers/merge_match_arms.rs +++ b/crates/ra_assists/src/handlers/merge_match_arms.rs @@ -81,10 +81,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option } fn contains_placeholder(a: &ast::MatchArm) -> bool { - match a.pat() { - Some(ra_syntax::ast::Pat::PlaceholderPat(..)) => true, - _ => false, - } + matches!(a.pat(), Some(ra_syntax::ast::Pat::PlaceholderPat(..))) } #[cfg(test)] -- cgit v1.2.3 From 503f9498cd469c6467250c02bd8f6dbce973dd57 Mon Sep 17 00:00:00 2001 From: Veetaha Date: Mon, 29 Jun 2020 01:18:50 +0300 Subject: Follow matklad suggestions - Move vis_offset() to utils.rs - Shorten explicit ra_syntax::ast -> ast - Undo refactoring exhaustive pattern to non-exhaustive --- crates/ra_assists/src/handlers/merge_match_arms.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_assists/src/handlers/merge_match_arms.rs') diff --git a/crates/ra_assists/src/handlers/merge_match_arms.rs b/crates/ra_assists/src/handlers/merge_match_arms.rs index 53c2c130f..90ce66378 100644 --- a/crates/ra_assists/src/handlers/merge_match_arms.rs +++ b/crates/ra_assists/src/handlers/merge_match_arms.rs @@ -81,7 +81,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option } fn contains_placeholder(a: &ast::MatchArm) -> bool { - matches!(a.pat(), Some(ra_syntax::ast::Pat::PlaceholderPat(..))) + matches!(a.pat(), Some(ast::Pat::PlaceholderPat(..))) } #[cfg(test)] -- cgit v1.2.3