diff options
author | Aleksey Kladov <[email protected]> | 2019-11-23 13:49:05 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-23 13:49:05 +0000 |
commit | dd5c2dc5bf9e9dee863bd79105b1782b654221f7 (patch) | |
tree | 85d06e13d0ba19d0e9e855ad013219ba0308e725 /crates/ra_hir_def/src/nameres.rs | |
parent | 338ff052c2fe658d6fcf88888918b2e372129e21 (diff) |
Move ImportId
Diffstat (limited to 'crates/ra_hir_def/src/nameres.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index 101203b7b..0b3b60a37 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -72,11 +72,9 @@ use rustc_hash::{FxHashMap, FxHashSet}; | |||
72 | use crate::{ | 72 | use crate::{ |
73 | builtin_type::BuiltinType, | 73 | builtin_type::BuiltinType, |
74 | db::DefDatabase, | 74 | db::DefDatabase, |
75 | nameres::{ | 75 | nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs}, |
76 | diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs, raw::ImportId, | ||
77 | }, | ||
78 | path::Path, | 76 | path::Path, |
79 | AstId, CrateModuleId, FunctionId, ImplId, ModuleDefId, ModuleId, TraitId, | 77 | AstId, CrateModuleId, FunctionId, ImplId, LocalImportId, ModuleDefId, ModuleId, TraitId, |
80 | }; | 78 | }; |
81 | 79 | ||
82 | /// Contains all top-level defs from a macro-expanded crate | 80 | /// Contains all top-level defs from a macro-expanded crate |
@@ -213,7 +211,7 @@ pub struct Resolution { | |||
213 | /// None for unresolved | 211 | /// None for unresolved |
214 | pub def: PerNs, | 212 | pub def: PerNs, |
215 | /// ident by which this is imported into local scope. | 213 | /// ident by which this is imported into local scope. |
216 | pub import: Option<ImportId>, | 214 | pub import: Option<LocalImportId>, |
217 | } | 215 | } |
218 | 216 | ||
219 | impl CrateDefMap { | 217 | impl CrateDefMap { |