diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
| commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
| tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_ide_api/src/join_lines.rs | |
| parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
| parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) | |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/join_lines.rs')
| -rw-r--r-- | crates/ra_ide_api/src/join_lines.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crates/ra_ide_api/src/join_lines.rs b/crates/ra_ide_api/src/join_lines.rs index 3978e9635..8ab485adb 100644 --- a/crates/ra_ide_api/src/join_lines.rs +++ b/crates/ra_ide_api/src/join_lines.rs | |||
| @@ -1,14 +1,11 @@ | |||
| 1 | use itertools::Itertools; | 1 | use itertools::Itertools; |
| 2 | use ra_fmt::{compute_ws, extract_trivial_expression}; | ||
| 2 | use ra_syntax::{ | 3 | use ra_syntax::{ |
| 3 | T, | ||
| 4 | SourceFile, TextRange, TextUnit, SyntaxNode, SyntaxElement, SyntaxToken, | ||
| 5 | SyntaxKind::{self, WHITESPACE}, | ||
| 6 | algo::{find_covering_element, non_trivia_sibling}, | 4 | algo::{find_covering_element, non_trivia_sibling}, |
| 7 | ast::{self, AstNode, AstToken}, | 5 | ast::{self, AstNode, AstToken}, |
| 8 | Direction, | 6 | Direction, SourceFile, SyntaxElement, |
| 9 | }; | 7 | SyntaxKind::{self, WHITESPACE}, |
| 10 | use ra_fmt::{ | 8 | SyntaxNode, SyntaxToken, TextRange, TextUnit, T, |
| 11 | compute_ws, extract_trivial_expression | ||
| 12 | }; | 9 | }; |
| 13 | use ra_text_edit::{TextEdit, TextEditBuilder}; | 10 | use ra_text_edit::{TextEdit, TextEditBuilder}; |
| 14 | 11 | ||