language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename ModuleId -> CrateModuleId

Browse source
This commit is contained in:
Aleksey Kladov 2019-03-16 18:57:53 +03:00
parent c51a6a7bdd
commit ee3cf6172b
8 changed files with 40 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_hir/src/resolve.rs
View file

@ -7,7 +7,7 @@ use crate::{
ModuleDef,
db::HirDatabase,
name::{Name, KnownName},
nameres::{PerNs, CrateDefMap, ModuleId},
nameres::{PerNs, CrateDefMap, CrateModuleId},
generics::GenericParams,
expr::{scope::{ExprScopes, ScopeId}, PatId, Body},
impl_block::ImplBlock,
@ -23,7 +23,7 @@ pub struct Resolver {
#[derive(Debug, Clone)]
pub(crate) struct ModuleItemMap {
crate_def_map: Arc<CrateDefMap>,
module_id: ModuleId,
module_id: CrateModuleId,
}
#[derive(Debug, Clone)]
@ -175,7 +175,7 @@ impl Resolver {
names
}
fn module(&self) -> Option<(&CrateDefMap, ModuleId)> {
fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> {
self.scopes.iter().rev().find_map(|scope| match scope {
Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)),
@ -209,7 +209,7 @@ impl Resolver {
pub(crate) fn push_module_scope(
self,
crate_def_map: Arc<CrateDefMap>,
module_id: ModuleId,
module_id: CrateModuleId,
) -> Resolver {
self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id }))
}