diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_ide/src/assists.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide/src/lib.rs | 1 | ||||
-rw-r--r-- | crates/ra_ide_db/src/imports_locator.rs (renamed from crates/ra_ide/src/imports_locator.rs) | 16 | ||||
-rw-r--r-- | crates/ra_ide_db/src/lib.rs | 1 |
4 files changed, 11 insertions, 11 deletions
diff --git a/crates/ra_ide/src/assists.rs b/crates/ra_ide/src/assists.rs index f26047570..4a7d8cfa9 100644 --- a/crates/ra_ide/src/assists.rs +++ b/crates/ra_ide/src/assists.rs | |||
@@ -3,9 +3,9 @@ | |||
3 | use either::Either; | 3 | use either::Either; |
4 | use ra_assists::{AssistAction, AssistLabel}; | 4 | use ra_assists::{AssistAction, AssistLabel}; |
5 | use ra_db::{FilePosition, FileRange}; | 5 | use ra_db::{FilePosition, FileRange}; |
6 | use ra_ide_db::RootDatabase; | 6 | use ra_ide_db::{imports_locator::ImportsLocatorIde, RootDatabase}; |
7 | 7 | ||
8 | use crate::{imports_locator::ImportsLocatorIde, FileId, SourceChange, SourceFileEdit}; | 8 | use crate::{FileId, SourceChange, SourceFileEdit}; |
9 | 9 | ||
10 | pub use ra_assists::AssistId; | 10 | pub use ra_assists::AssistId; |
11 | 11 | ||
diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index 5fb111a90..689921f3f 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs | |||
@@ -26,7 +26,6 @@ mod syntax_highlighting; | |||
26 | mod parent_module; | 26 | mod parent_module; |
27 | mod references; | 27 | mod references; |
28 | mod impls; | 28 | mod impls; |
29 | mod imports_locator; | ||
30 | mod assists; | 29 | mod assists; |
31 | mod diagnostics; | 30 | mod diagnostics; |
32 | mod syntax_tree; | 31 | mod syntax_tree; |
diff --git a/crates/ra_ide/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs index 0dca0c86c..21e637608 100644 --- a/crates/ra_ide/src/imports_locator.rs +++ b/crates/ra_ide_db/src/imports_locator.rs | |||
@@ -3,22 +3,22 @@ | |||
3 | 3 | ||
4 | use hir::{db::HirDatabase, ModuleDef, SourceBinder}; | 4 | use hir::{db::HirDatabase, ModuleDef, SourceBinder}; |
5 | use ra_assists::ImportsLocator; | 5 | use ra_assists::ImportsLocator; |
6 | use ra_ide_db::{ | ||
7 | defs::NameKind, | ||
8 | symbol_index::{self, FileSymbol}, | ||
9 | RootDatabase, | ||
10 | }; | ||
11 | use ra_prof::profile; | 6 | use ra_prof::profile; |
12 | use ra_syntax::{ast, AstNode, SyntaxKind::NAME}; | 7 | use ra_syntax::{ast, AstNode, SyntaxKind::NAME}; |
13 | 8 | ||
14 | use crate::{references::classify_name, Query}; | 9 | use crate::{ |
10 | defs::classify_name, | ||
11 | defs::NameKind, | ||
12 | symbol_index::{self, FileSymbol, Query}, | ||
13 | RootDatabase, | ||
14 | }; | ||
15 | 15 | ||
16 | pub(crate) struct ImportsLocatorIde<'a> { | 16 | pub struct ImportsLocatorIde<'a> { |
17 | source_binder: SourceBinder<'a, RootDatabase>, | 17 | source_binder: SourceBinder<'a, RootDatabase>, |
18 | } | 18 | } |
19 | 19 | ||
20 | impl<'a> ImportsLocatorIde<'a> { | 20 | impl<'a> ImportsLocatorIde<'a> { |
21 | pub(crate) fn new(db: &'a RootDatabase) -> Self { | 21 | pub fn new(db: &'a RootDatabase) -> Self { |
22 | Self { source_binder: SourceBinder::new(db) } | 22 | Self { source_binder: SourceBinder::new(db) } |
23 | } | 23 | } |
24 | 24 | ||
diff --git a/crates/ra_ide_db/src/lib.rs b/crates/ra_ide_db/src/lib.rs index 0715dfc66..877ac3c38 100644 --- a/crates/ra_ide_db/src/lib.rs +++ b/crates/ra_ide_db/src/lib.rs | |||
@@ -8,6 +8,7 @@ pub mod feature_flags; | |||
8 | pub mod symbol_index; | 8 | pub mod symbol_index; |
9 | pub mod change; | 9 | pub mod change; |
10 | pub mod defs; | 10 | pub mod defs; |
11 | pub mod imports_locator; | ||
11 | mod wasm_shims; | 12 | mod wasm_shims; |
12 | 13 | ||
13 | use std::sync::Arc; | 14 | use std::sync::Arc; |