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/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_ide_api/src/lib.rs')
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index 817e65df0..95de9bcb8 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs | |||
@@ -46,33 +46,35 @@ mod test_utils; | |||
46 | 46 | ||
47 | use std::sync::Arc; | 47 | use std::sync::Arc; |
48 | 48 | ||
49 | use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit}; | ||
50 | use ra_text_edit::TextEdit; | ||
51 | use ra_db::{ | 49 | use ra_db::{ |
52 | SourceDatabase, CheckCanceled, | ||
53 | salsa::{self, ParallelDatabase}, | 50 | salsa::{self, ParallelDatabase}, |
51 | CheckCanceled, SourceDatabase, | ||
54 | }; | 52 | }; |
53 | use ra_syntax::{SourceFile, TextRange, TextUnit, TreeArc}; | ||
54 | use ra_text_edit::TextEdit; | ||
55 | use relative_path::RelativePathBuf; | 55 | use relative_path::RelativePathBuf; |
56 | 56 | ||
57 | use crate::{symbol_index::FileSymbol, db::LineIndexDatabase}; | 57 | use crate::{db::LineIndexDatabase, symbol_index::FileSymbol}; |
58 | 58 | ||
59 | pub use crate::{ | 59 | pub use crate::{ |
60 | assists::{Assist, AssistId}, | ||
60 | change::{AnalysisChange, LibraryData}, | 61 | change::{AnalysisChange, LibraryData}, |
61 | completion::{CompletionItem, CompletionItemKind, InsertTextFormat}, | 62 | completion::{CompletionItem, CompletionItemKind, InsertTextFormat}, |
62 | runnables::{Runnable, RunnableKind}, | 63 | diagnostics::Severity, |
63 | references::ReferenceSearchResult, | 64 | display::{file_structure, FunctionSignature, NavigationTarget, StructureNode}, |
64 | assists::{Assist, AssistId}, | ||
65 | hover::{HoverResult}, | ||
66 | line_index::{LineIndex, LineCol}, | ||
67 | line_index_utils::translate_offset_with_edit, | ||
68 | folding_ranges::{Fold, FoldKind}, | 65 | folding_ranges::{Fold, FoldKind}, |
66 | hover::HoverResult, | ||
67 | line_index::{LineCol, LineIndex}, | ||
68 | line_index_utils::translate_offset_with_edit, | ||
69 | references::ReferenceSearchResult, | ||
70 | runnables::{Runnable, RunnableKind}, | ||
69 | syntax_highlighting::HighlightedRange, | 71 | syntax_highlighting::HighlightedRange, |
70 | diagnostics::Severity, | ||
71 | display::{FunctionSignature, NavigationTarget, StructureNode, file_structure}, | ||
72 | }; | 72 | }; |
73 | 73 | ||
74 | pub use ra_db::{Canceled, CrateGraph, CrateId, FileId, FilePosition, FileRange, SourceRootId, Edition}; | ||
75 | pub use hir::Documentation; | 74 | pub use hir::Documentation; |
75 | pub use ra_db::{ | ||
76 | Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRootId, | ||
77 | }; | ||
76 | 78 | ||
77 | pub type Cancelable<T> = Result<T, Canceled>; | 79 | pub type Cancelable<T> = Result<T, Canceled>; |
78 | 80 | ||