diff options
Diffstat (limited to 'crates/ra_hir_def/src/resolver.rs')
-rw-r--r-- | crates/ra_hir_def/src/resolver.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs index 48a836a20..e64face7e 100644 --- a/crates/ra_hir_def/src/resolver.rs +++ b/crates/ra_hir_def/src/resolver.rs | |||
@@ -16,9 +16,9 @@ use crate::{ | |||
16 | generics::GenericParams, | 16 | generics::GenericParams, |
17 | nameres::{per_ns::PerNs, CrateDefMap}, | 17 | nameres::{per_ns::PerNs, CrateDefMap}, |
18 | path::{Path, PathKind}, | 18 | path::{Path, PathKind}, |
19 | AdtId, AstItemDef, ConstId, ContainerId, CrateModuleId, DefWithBodyId, EnumId, EnumVariantId, | 19 | AdtId, AstItemDef, ConstId, ContainerId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, |
20 | FunctionId, GenericDefId, ImplId, Lookup, ModuleDefId, ModuleId, StaticId, StructId, TraitId, | 20 | GenericDefId, ImplId, LocalModuleId, Lookup, ModuleDefId, ModuleId, StaticId, StructId, |
21 | TypeAliasId, | 21 | TraitId, TypeAliasId, |
22 | }; | 22 | }; |
23 | 23 | ||
24 | #[derive(Debug, Clone, Default)] | 24 | #[derive(Debug, Clone, Default)] |
@@ -30,7 +30,7 @@ pub struct Resolver { | |||
30 | #[derive(Debug, Clone)] | 30 | #[derive(Debug, Clone)] |
31 | pub(crate) struct ModuleItemMap { | 31 | pub(crate) struct ModuleItemMap { |
32 | crate_def_map: Arc<CrateDefMap>, | 32 | crate_def_map: Arc<CrateDefMap>, |
33 | module_id: CrateModuleId, | 33 | module_id: LocalModuleId, |
34 | } | 34 | } |
35 | 35 | ||
36 | #[derive(Debug, Clone)] | 36 | #[derive(Debug, Clone)] |
@@ -330,7 +330,7 @@ impl Resolver { | |||
330 | traits | 330 | traits |
331 | } | 331 | } |
332 | 332 | ||
333 | fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { | 333 | fn module(&self) -> Option<(&CrateDefMap, LocalModuleId)> { |
334 | self.scopes.iter().rev().find_map(|scope| match scope { | 334 | self.scopes.iter().rev().find_map(|scope| match scope { |
335 | Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), | 335 | Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), |
336 | 336 | ||
@@ -466,7 +466,7 @@ impl Resolver { | |||
466 | fn push_module_scope( | 466 | fn push_module_scope( |
467 | self, | 467 | self, |
468 | crate_def_map: Arc<CrateDefMap>, | 468 | crate_def_map: Arc<CrateDefMap>, |
469 | module_id: CrateModuleId, | 469 | module_id: LocalModuleId, |
470 | ) -> Resolver { | 470 | ) -> Resolver { |
471 | self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id })) | 471 | self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id })) |
472 | } | 472 | } |