aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-12-21 14:25:15 +0000
committerGitHub <[email protected]>2019-12-21 14:25:15 +0000
commit4528cb3f2c0724d140519c952099e35c63ce8f77 (patch)
tree085b33cc69bac4812fa5e25b7f227f21e030d91d /crates/ra_hir_def/src
parentdf45f28fedab9b0620ea038849ec8e93c3b4ab26 (diff)
parent4e0168ec14b74003e8388b72b64c2ca78b580274 (diff)
Merge #2633
2633: Remove imports from hir r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r--crates/ra_hir_def/src/item_scope.rs2
-rw-r--r--crates/ra_hir_def/src/lib.rs2
-rw-r--r--crates/ra_hir_def/src/nameres/raw.rs6
3 files changed, 2 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs
index 6b9be8325..ad104bb3d 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/ra_hir_def/src/item_scope.rs
@@ -161,5 +161,5 @@ pub struct Resolution {
161 /// None for unresolved 161 /// None for unresolved
162 pub def: PerNs, 162 pub def: PerNs,
163 /// ident by which this is imported into local scope. 163 /// ident by which this is imported into local scope.
164 pub import: Option<LocalImportId>, 164 pub(crate) import: Option<LocalImportId>,
165} 165}
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index acd4f4af1..8cb5ab8d0 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -52,7 +52,7 @@ use crate::body::Expander;
52use crate::builtin_type::BuiltinType; 52use crate::builtin_type::BuiltinType;
53 53
54#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 54#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
55pub struct LocalImportId(RawId); 55pub(crate) struct LocalImportId(RawId);
56impl_arena_id!(LocalImportId); 56impl_arena_id!(LocalImportId);
57 57
58#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 58#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs
index ecb4d7c03..df5dac88a 100644
--- a/crates/ra_hir_def/src/nameres/raw.rs
+++ b/crates/ra_hir_def/src/nameres/raw.rs
@@ -48,12 +48,6 @@ pub struct ImportSourceMap {
48 48
49type ImportSourcePtr = Either<AstPtr<ast::UseTree>, AstPtr<ast::ExternCrateItem>>; 49type ImportSourcePtr = Either<AstPtr<ast::UseTree>, AstPtr<ast::ExternCrateItem>>;
50 50
51impl ImportSourceMap {
52 pub fn get(&self, import: LocalImportId) -> ImportSourcePtr {
53 self.map[import].clone()
54 }
55}
56
57impl RawItems { 51impl RawItems {
58 pub(crate) fn raw_items_query( 52 pub(crate) fn raw_items_query(
59 db: &(impl DefDatabase + AstDatabase), 53 db: &(impl DefDatabase + AstDatabase),