aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-06 17:30:57 +0000
committerGitHub <[email protected]>2020-02-06 17:30:57 +0000
commit918115c32e9a3882d1dd65f2403bd109fc64c798 (patch)
treecd660466355281aea5dfbec84578e529b9c3e393 /crates
parent46027e10be3d23643bc41ffa8dc8c7cf4013b21a (diff)
parentf4a4fcf2753f48b81873de5dc39c1159d2a88654 (diff)
Merge #3036
3036: Remove the leftovers after ImportLocator removal r=matklad a=SomeoneToIgnore Follow the FIXME's suggestion (https://github.com/rust-analyzer/rust-analyzer/pull/3034/files#diff-001b3b1412c33fee802c22b0f848dcd7L237) and remove the `ModuleDefId` reexport. Also rename `ImportsLocatorIde` into plain `ImportsLocator` Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_assists/src/assists/auto_import.rs4
-rw-r--r--crates/ra_hir/src/lib.rs1
-rw-r--r--crates/ra_ide_db/src/imports_locator.rs4
3 files changed, 4 insertions, 5 deletions
diff --git a/crates/ra_assists/src/assists/auto_import.rs b/crates/ra_assists/src/assists/auto_import.rs
index f16b08c43..10c4b7d7c 100644
--- a/crates/ra_assists/src/assists/auto_import.rs
+++ b/crates/ra_assists/src/assists/auto_import.rs
@@ -8,7 +8,7 @@ use crate::{
8 assist_ctx::{ActionBuilder, Assist, AssistCtx}, 8 assist_ctx::{ActionBuilder, Assist, AssistCtx},
9 auto_import_text_edit, AssistId, 9 auto_import_text_edit, AssistId,
10}; 10};
11use ra_ide_db::imports_locator::ImportsLocatorIde; 11use ra_ide_db::imports_locator::ImportsLocator;
12 12
13// Assist: auto_import 13// Assist: auto_import
14// 14//
@@ -52,7 +52,7 @@ pub(crate) fn auto_import(ctx: AssistCtx) -> Option<Assist> {
52 return None; 52 return None;
53 } 53 }
54 54
55 let mut imports_locator = ImportsLocatorIde::new(ctx.db); 55 let mut imports_locator = ImportsLocator::new(ctx.db);
56 56
57 let proposed_imports = imports_locator 57 let proposed_imports = imports_locator
58 .find_imports(&name_to_import) 58 .find_imports(&name_to_import)
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index ea06a4a58..86e422779 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -56,7 +56,6 @@ pub use hir_def::{
56 nameres::ModuleSource, 56 nameres::ModuleSource,
57 path::{ModPath, Path, PathKind}, 57 path::{ModPath, Path, PathKind},
58 type_ref::Mutability, 58 type_ref::Mutability,
59 ModuleDefId, // FIXME this is exposed and should be used for implementing the `TestImportsLocator` in `ra_assists` only, should be removed later along with the trait and the implementation.
60}; 59};
61pub use hir_expand::{ 60pub use hir_expand::{
62 name::{name, Name}, 61 name::{name, Name},
diff --git a/crates/ra_ide_db/src/imports_locator.rs b/crates/ra_ide_db/src/imports_locator.rs
index d77fc53f3..401b8ac0b 100644
--- a/crates/ra_ide_db/src/imports_locator.rs
+++ b/crates/ra_ide_db/src/imports_locator.rs
@@ -12,11 +12,11 @@ use crate::{
12 RootDatabase, 12 RootDatabase,
13}; 13};
14 14
15pub struct ImportsLocatorIde<'a> { 15pub struct ImportsLocator<'a> {
16 source_binder: SourceBinder<'a, RootDatabase>, 16 source_binder: SourceBinder<'a, RootDatabase>,
17} 17}
18 18
19impl<'a> ImportsLocatorIde<'a> { 19impl<'a> ImportsLocator<'a> {
20 pub fn new(db: &'a RootDatabase) -> Self { 20 pub fn new(db: &'a RootDatabase) -> Self {
21 Self { source_binder: SourceBinder::new(db) } 21 Self { source_binder: SourceBinder::new(db) }
22 } 22 }