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_assists/src/lib.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_assists/src/lib.rs')
-rw-r--r-- | crates/ra_assists/src/lib.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_assists/src/lib.rs b/crates/ra_assists/src/lib.rs index 28eb0226b..0d848629d 100644 --- a/crates/ra_assists/src/lib.rs +++ b/crates/ra_assists/src/lib.rs | |||
@@ -11,12 +11,12 @@ pub mod ast_editor; | |||
11 | 11 | ||
12 | use itertools::Itertools; | 12 | use itertools::Itertools; |
13 | 13 | ||
14 | use ra_text_edit::TextEdit; | ||
15 | use ra_syntax::{TextRange, TextUnit}; | ||
16 | use ra_db::FileRange; | ||
17 | use hir::db::HirDatabase; | 14 | use hir::db::HirDatabase; |
15 | use ra_db::FileRange; | ||
16 | use ra_syntax::{TextRange, TextUnit}; | ||
17 | use ra_text_edit::TextEdit; | ||
18 | 18 | ||
19 | pub(crate) use crate::assist_ctx::{AssistCtx, Assist}; | 19 | pub(crate) use crate::assist_ctx::{Assist, AssistCtx}; |
20 | 20 | ||
21 | /// Unique identifier of the assist, should not be shown to the user | 21 | /// Unique identifier of the assist, should not be shown to the user |
22 | /// directly. | 22 | /// directly. |
@@ -127,11 +127,11 @@ fn all_assists<DB: HirDatabase>() -> &'static [fn(AssistCtx<DB>) -> Option<Assis | |||
127 | #[cfg(test)] | 127 | #[cfg(test)] |
128 | mod helpers { | 128 | mod helpers { |
129 | use hir::mock::MockDatabase; | 129 | use hir::mock::MockDatabase; |
130 | use ra_syntax::TextRange; | ||
131 | use ra_db::FileRange; | 130 | use ra_db::FileRange; |
132 | use test_utils::{extract_offset, extract_range, assert_eq_text, add_cursor}; | 131 | use ra_syntax::TextRange; |
132 | use test_utils::{add_cursor, assert_eq_text, extract_offset, extract_range}; | ||
133 | 133 | ||
134 | use crate::{AssistCtx, Assist}; | 134 | use crate::{Assist, AssistCtx}; |
135 | 135 | ||
136 | pub(crate) fn check_assist( | 136 | pub(crate) fn check_assist( |
137 | assist: fn(AssistCtx<MockDatabase>) -> Option<Assist>, | 137 | assist: fn(AssistCtx<MockDatabase>) -> Option<Assist>, |
@@ -289,8 +289,8 @@ mod helpers { | |||
289 | #[cfg(test)] | 289 | #[cfg(test)] |
290 | mod tests { | 290 | mod tests { |
291 | use hir::mock::MockDatabase; | 291 | use hir::mock::MockDatabase; |
292 | use ra_syntax::TextRange; | ||
293 | use ra_db::FileRange; | 292 | use ra_db::FileRange; |
293 | use ra_syntax::TextRange; | ||
294 | use test_utils::{extract_offset, extract_range}; | 294 | use test_utils::{extract_offset, extract_range}; |
295 | 295 | ||
296 | #[test] | 296 | #[test] |