diff options
| author | Galilée 'Bill' Enguehard <[email protected]> | 2020-05-21 22:27:38 +0100 |
|---|---|---|
| committer | Galilée 'Bill' Enguehard <[email protected]> | 2020-05-21 22:27:38 +0100 |
| commit | 7fece3bdd2450c0807f7dd742239cae95f0cc65e (patch) | |
| tree | 866c4db826c959e79c63a6727bdb9f2c61e6fc4f /crates/ra_fmt/src | |
| parent | db926218b2082077750291f8426ddd28b284cd08 (diff) | |
| parent | 59732df8d40dfadc6dcf5951265416576399712a (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into modname_spacing
Diffstat (limited to 'crates/ra_fmt/src')
| -rw-r--r-- | crates/ra_fmt/src/lib.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs index 1a30b2b3a..f910ded9d 100644 --- a/crates/ra_fmt/src/lib.rs +++ b/crates/ra_fmt/src/lib.rs | |||
| @@ -42,7 +42,6 @@ pub fn unwrap_trivial_block(block: ast::BlockExpr) -> ast::Expr { | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> { | 44 | pub fn extract_trivial_expression(block: &ast::BlockExpr) -> Option<ast::Expr> { |
| 45 | let block = block.block()?; | ||
| 46 | let has_anything_else = |thing: &SyntaxNode| -> bool { | 45 | let has_anything_else = |thing: &SyntaxNode| -> bool { |
| 47 | let mut non_trivial_children = | 46 | let mut non_trivial_children = |
| 48 | block.syntax().children_with_tokens().filter(|it| match it.kind() { | 47 | block.syntax().children_with_tokens().filter(|it| match it.kind() { |