diff options
author | Aleksey Kladov <[email protected]> | 2019-07-04 21:05:17 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-07-04 21:09:09 +0100 |
commit | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (patch) | |
tree | 92c8b984e874b67fa1831613464bbe356c1af3dd /crates/ra_ide_api/src/join_lines.rs | |
parent | 2b2cd829b0f95aef338227deb05ec7503dae9b6c (diff) |
allow rustfmt to reorder imports
This wasn't a right decision in the first place, the feature flag was
broken in the last rustfmt release, and syntax highlighting of imports
is more important anyway
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 | ||