diff options
author | Aleksey Kladov <[email protected]> | 2020-12-17 11:17:13 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-12-18 15:02:11 +0000 |
commit | 2465fa02b7aa268d7d711b81417e7717427217c3 (patch) | |
tree | c288773ac387ffaec503bfd483b3bcc39f373e8d /crates | |
parent | 03c177af89efcc238053b59069eda2c1c6772622 (diff) |
Cleaup imports
ide should re-export everything it needs.
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ide/src/lib.rs | 14 | ||||
-rw-r--r-- | crates/rust-analyzer/src/to_proto.rs | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index c5c652cda..4b245c040 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
@@ -57,7 +57,7 @@ use ide_db::{ | |||
57 | symbol_index::{self, FileSymbol}, | 57 | symbol_index::{self, FileSymbol}, |
58 | LineIndexDatabase, | 58 | LineIndexDatabase, |
59 | }; | 59 | }; |
60 | use syntax::{SourceFile, TextRange, TextSize}; | 60 | use syntax::SourceFile; |
61 | 61 | ||
62 | use crate::display::ToNav; | 62 | use crate::display::ToNav; |
63 | 63 | ||
@@ -79,22 +79,21 @@ pub use crate::{ | |||
79 | HighlightedRange, | 79 | HighlightedRange, |
80 | }, | 80 | }, |
81 | }; | 81 | }; |
82 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | ||
82 | pub use completion::{ | 83 | pub use completion::{ |
83 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionResolveCapability, | 84 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionResolveCapability, |
84 | CompletionScore, ImportEdit, InsertTextFormat, | 85 | CompletionScore, ImportEdit, InsertTextFormat, |
85 | }; | 86 | }; |
86 | pub use ide_db::{ | ||
87 | call_info::CallInfo, | ||
88 | search::{Reference, ReferenceAccess, ReferenceKind}, | ||
89 | }; | ||
90 | |||
91 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | ||
92 | pub use hir::{Documentation, Semantics}; | 87 | pub use hir::{Documentation, Semantics}; |
93 | pub use ide_db::base_db::{ | 88 | pub use ide_db::base_db::{ |
94 | Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, | 89 | Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, |
95 | SourceRootId, | 90 | SourceRootId, |
96 | }; | 91 | }; |
97 | pub use ide_db::{ | 92 | pub use ide_db::{ |
93 | call_info::CallInfo, | ||
94 | search::{Reference, ReferenceAccess, ReferenceKind}, | ||
95 | }; | ||
96 | pub use ide_db::{ | ||
98 | label::Label, | 97 | label::Label, |
99 | line_index::{LineCol, LineIndex}, | 98 | line_index::{LineCol, LineIndex}, |
100 | search::SearchScope, | 99 | search::SearchScope, |
@@ -103,6 +102,7 @@ pub use ide_db::{ | |||
103 | RootDatabase, | 102 | RootDatabase, |
104 | }; | 103 | }; |
105 | pub use ssr::SsrError; | 104 | pub use ssr::SsrError; |
105 | pub use syntax::{TextRange, TextSize}; | ||
106 | pub use text_edit::{Indel, TextEdit}; | 106 | pub use text_edit::{Indel, TextEdit}; |
107 | 107 | ||
108 | pub type Cancelable<T> = Result<T, Canceled>; | 108 | pub type Cancelable<T> = Result<T, Canceled>; |
diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 72f77a016..1753bbff2 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs | |||
@@ -5,14 +5,14 @@ use std::{ | |||
5 | }; | 5 | }; |
6 | 6 | ||
7 | use ide::{ | 7 | use ide::{ |
8 | Assist, AssistKind, CallInfo, CompletionItem, CompletionItemKind, Documentation, | 8 | Assist, AssistKind, CallInfo, CompletionItem, CompletionItemKind, Documentation, FileId, |
9 | FileSystemEdit, Fold, FoldKind, Highlight, HighlightModifier, HighlightTag, HighlightedRange, | 9 | FileRange, FileSystemEdit, Fold, FoldKind, Highlight, HighlightModifier, HighlightTag, |
10 | Indel, InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup, NavigationTarget, | 10 | HighlightedRange, Indel, InlayHint, InlayKind, InsertTextFormat, LineIndex, Markup, |
11 | ReferenceAccess, ResolvedAssist, Runnable, Severity, SourceChange, SourceFileEdit, TextEdit, | 11 | NavigationTarget, ReferenceAccess, ResolvedAssist, Runnable, Severity, SourceChange, |
12 | SourceFileEdit, TextEdit, TextRange, TextSize, | ||
12 | }; | 13 | }; |
13 | use ide_db::base_db::{FileId, FileRange}; | ||
14 | use itertools::Itertools; | 14 | use itertools::Itertools; |
15 | use syntax::{SyntaxKind, TextRange, TextSize}; | 15 | use syntax::SyntaxKind; |
16 | 16 | ||
17 | use crate::{ | 17 | use crate::{ |
18 | cargo_target_spec::CargoTargetSpec, global_state::GlobalStateSnapshot, | 18 | cargo_target_spec::CargoTargetSpec, global_state::GlobalStateSnapshot, |