Merge #876

876: Fix join_lines not adding a comma after join_single_expr_block with match arm r=matklad a=vipentti

Fixes #868 

Co-authored-by: Ville Penttinen <[email protected]>

1 files changed, 1 insertions, 5 deletions

diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs
index 7bd9b5ae6..e1e899edc 100644
--- a/crates/ra_assists/src/lib.rs
+++ b/crates/ra_assists/src/lib.rs
@@ -10,7 +10,7 @@ mod assist_ctx;
 use itertools::Itertools;
 
 use ra_text_edit::TextEdit;
-use ra_syntax::{TextRange, TextUnit, SyntaxNode, Direction};
+use ra_syntax::{TextRange, TextUnit};
 use ra_db::FileRange;
 use hir::db::HirDatabase;
 
@@ -104,10 +104,6 @@ fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assis
     ]
 }
 
-fn non_trivia_sibling(node: &SyntaxNode, direction: Direction) -> Option<&SyntaxNode> {
-    node.siblings(direction).skip(1).find(|node| !node.kind().is_trivia())
-}
-
 #[cfg(test)]
 mod helpers {
     use hir::mock::MockDatabase;