diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-20 14:52:33 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-20 14:52:33 +0100 |
| commit | 3983ccca4ac46bb7b206a5b373b10c9822280931 (patch) | |
| tree | e72c3798558b7b0494990d1c994ebd9c0f3c03f3 /crates/ra_fmt | |
| parent | dac6adbef90286f053f034eace9df65d6a19c0ff (diff) | |
| parent | f6bcc2d7459a3e10090391a6f9b9a2789e9cab55 (diff) | |
Merge #1566
1566: align SyntaxText API with upstream r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_fmt')
| -rw-r--r-- | crates/ra_fmt/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_fmt/src/lib.rs b/crates/ra_fmt/src/lib.rs index d6e895729..b09478d7a 100644 --- a/crates/ra_fmt/src/lib.rs +++ b/crates/ra_fmt/src/lib.rs | |||
| @@ -36,7 +36,7 @@ fn prev_tokens(token: SyntaxToken) -> impl Iterator<Item = SyntaxToken> { | |||
| 36 | 36 | ||
| 37 | pub fn extract_trivial_expression(block: &ast::Block) -> Option<ast::Expr> { | 37 | pub fn extract_trivial_expression(block: &ast::Block) -> Option<ast::Expr> { |
| 38 | let expr = block.expr()?; | 38 | let expr = block.expr()?; |
| 39 | if expr.syntax().text().contains('\n') { | 39 | if expr.syntax().text().contains_char('\n') { |
| 40 | return None; | 40 | return None; |
| 41 | } | 41 | } |
| 42 | let non_trivial_children = block.syntax().children().filter(|it| match it.kind() { | 42 | let non_trivial_children = block.syntax().children().filter(|it| match it.kind() { |