diff options
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r-- | crates/ra_hir/src/resolve.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index e85447eeb..59af4ec60 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs | |||
@@ -7,7 +7,7 @@ use crate::{ | |||
7 | ModuleDef, | 7 | ModuleDef, |
8 | db::HirDatabase, | 8 | db::HirDatabase, |
9 | name::{Name, KnownName}, | 9 | name::{Name, KnownName}, |
10 | nameres::{PerNs, CrateDefMap, ModuleId}, | 10 | nameres::{PerNs, CrateDefMap, CrateModuleId}, |
11 | generics::GenericParams, | 11 | generics::GenericParams, |
12 | expr::{scope::{ExprScopes, ScopeId}, PatId, Body}, | 12 | expr::{scope::{ExprScopes, ScopeId}, PatId, Body}, |
13 | impl_block::ImplBlock, | 13 | impl_block::ImplBlock, |
@@ -23,7 +23,7 @@ pub struct Resolver { | |||
23 | #[derive(Debug, Clone)] | 23 | #[derive(Debug, Clone)] |
24 | pub(crate) struct ModuleItemMap { | 24 | pub(crate) struct ModuleItemMap { |
25 | crate_def_map: Arc<CrateDefMap>, | 25 | crate_def_map: Arc<CrateDefMap>, |
26 | module_id: ModuleId, | 26 | module_id: CrateModuleId, |
27 | } | 27 | } |
28 | 28 | ||
29 | #[derive(Debug, Clone)] | 29 | #[derive(Debug, Clone)] |
@@ -175,7 +175,7 @@ impl Resolver { | |||
175 | names | 175 | names |
176 | } | 176 | } |
177 | 177 | ||
178 | fn module(&self) -> Option<(&CrateDefMap, ModuleId)> { | 178 | fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { |
179 | self.scopes.iter().rev().find_map(|scope| match scope { | 179 | self.scopes.iter().rev().find_map(|scope| match scope { |
180 | Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), | 180 | Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), |
181 | 181 | ||
@@ -209,7 +209,7 @@ impl Resolver { | |||
209 | pub(crate) fn push_module_scope( | 209 | pub(crate) fn push_module_scope( |
210 | self, | 210 | self, |
211 | crate_def_map: Arc<CrateDefMap>, | 211 | crate_def_map: Arc<CrateDefMap>, |
212 | module_id: ModuleId, | 212 | module_id: CrateModuleId, |
213 | ) -> Resolver { | 213 | ) -> Resolver { |
214 | self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id })) | 214 | self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id })) |
215 | } | 215 | } |