From 158b1cb524d8e07aa7a6ec2342bca2ce4667d316 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 23 Nov 2019 16:49:53 +0300 Subject: Rename CrateModuleId --- crates/ra_hir/src/code_model.rs | 6 ++-- crates/ra_hir_def/src/lib.rs | 6 ++-- crates/ra_hir_def/src/nameres.rs | 32 ++++++++--------- crates/ra_hir_def/src/nameres/collector.rs | 40 +++++++++++----------- crates/ra_hir_def/src/nameres/path_resolution.rs | 6 ++-- crates/ra_hir_def/src/nameres/tests.rs | 4 +-- .../ra_hir_def/src/nameres/tests/mod_resolution.rs | 2 +- crates/ra_hir_def/src/resolver.rs | 12 +++---- 8 files changed, 54 insertions(+), 54 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 07c56843a..2442fb6a5 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -12,7 +12,7 @@ use hir_def::{ nameres::per_ns::PerNs, resolver::{HasResolver, TypeNs}, type_ref::TypeRef, - ContainerId, CrateModuleId, HasModule, ImplId, LocalEnumVariantId, LocalImportId, + ContainerId, HasModule, ImplId, LocalEnumVariantId, LocalImportId, LocalModuleId, LocalStructFieldId, Lookup, ModuleId, UnionId, }; use hir_expand::{ @@ -112,7 +112,7 @@ impl_froms!( pub use hir_def::{attr::Attrs, ModuleSource}; impl Module { - pub(crate) fn new(krate: Crate, crate_module_id: CrateModuleId) -> Module { + pub(crate) fn new(krate: Crate, crate_module_id: LocalModuleId) -> Module { Module { id: ModuleId { krate: krate.crate_id, module_id: crate_module_id } } } @@ -222,7 +222,7 @@ impl Module { def_map[self.id.module_id].impls.iter().copied().map(ImplBlock::from).collect() } - fn with_module_id(self, module_id: CrateModuleId) -> Module { + fn with_module_id(self, module_id: LocalModuleId) -> Module { Module::new(self.krate(), module_id) } } diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs index b74038b50..2cfe68701 100644 --- a/crates/ra_hir_def/src/lib.rs +++ b/crates/ra_hir_def/src/lib.rs @@ -106,14 +106,14 @@ impl_arena_id!(LocalImportId); #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct ModuleId { pub krate: CrateId, - pub module_id: CrateModuleId, + pub module_id: LocalModuleId, } /// An ID of a module, **local** to a specific crate // FIXME: rename to `LocalModuleId`. #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] -pub struct CrateModuleId(RawId); -impl_arena_id!(CrateModuleId); +pub struct LocalModuleId(RawId); +impl_arena_id!(LocalModuleId); macro_rules! impl_intern_key { ($name:ident) => { diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index 0b3b60a37..d82356bbd 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs @@ -74,7 +74,7 @@ use crate::{ db::DefDatabase, nameres::{diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs}, path::Path, - AstId, CrateModuleId, FunctionId, ImplId, LocalImportId, ModuleDefId, ModuleId, TraitId, + AstId, FunctionId, ImplId, LocalImportId, LocalModuleId, ModuleDefId, ModuleId, TraitId, }; /// Contains all top-level defs from a macro-expanded crate @@ -87,8 +87,8 @@ pub struct CrateDefMap { /// a dependency (`std` or `core`). prelude: Option, extern_prelude: FxHashMap, - root: CrateModuleId, - modules: Arena, + root: LocalModuleId, + modules: Arena, /// Some macros are not well-behavior, which leads to infinite loop /// e.g. macro_rules! foo { ($ty:ty) => { foo!($ty); } } @@ -105,17 +105,17 @@ pub struct CrateDefMap { diagnostics: Vec, } -impl std::ops::Index for CrateDefMap { +impl std::ops::Index for CrateDefMap { type Output = ModuleData; - fn index(&self, id: CrateModuleId) -> &ModuleData { + fn index(&self, id: LocalModuleId) -> &ModuleData { &self.modules[id] } } #[derive(Default, Debug, PartialEq, Eq)] pub struct ModuleData { - pub parent: Option, - pub children: FxHashMap, + pub parent: Option, + pub children: FxHashMap, pub scope: ModuleScope, // FIXME: these can't be both null, we need a three-state enum here. @@ -225,7 +225,7 @@ impl CrateDefMap { let def_map = { let crate_graph = db.crate_graph(); let edition = crate_graph.edition(krate); - let mut modules: Arena = Arena::default(); + let mut modules: Arena = Arena::default(); let root = modules.alloc(ModuleData::default()); CrateDefMap { krate, @@ -246,7 +246,7 @@ impl CrateDefMap { self.krate } - pub fn root(&self) -> CrateModuleId { + pub fn root(&self) -> LocalModuleId { self.root } @@ -261,7 +261,7 @@ impl CrateDefMap { pub fn add_diagnostics( &self, db: &impl DefDatabase, - module: CrateModuleId, + module: LocalModuleId, sink: &mut DiagnosticSink, ) { self.diagnostics.iter().for_each(|it| it.add_to(db, module, sink)) @@ -270,18 +270,18 @@ impl CrateDefMap { pub fn resolve_path( &self, db: &impl DefDatabase, - original_module: CrateModuleId, + original_module: LocalModuleId, path: &Path, ) -> (PerNs, Option) { let res = self.resolve_path_fp_with_macro(db, ResolveMode::Other, original_module, path); (res.resolved_def, res.segment_index) } - pub fn modules(&self) -> impl Iterator + '_ { + pub fn modules(&self) -> impl Iterator + '_ { self.modules.iter().map(|(id, _data)| id) } - pub fn modules_for_file(&self, file_id: FileId) -> impl Iterator + '_ { + pub fn modules_for_file(&self, file_id: FileId) -> impl Iterator + '_ { self.modules .iter() .filter(move |(_id, data)| data.definition == Some(file_id)) @@ -317,12 +317,12 @@ mod diagnostics { use ra_db::RelativePathBuf; use ra_syntax::{ast, AstPtr}; - use crate::{db::DefDatabase, diagnostics::UnresolvedModule, nameres::CrateModuleId, AstId}; + use crate::{db::DefDatabase, diagnostics::UnresolvedModule, nameres::LocalModuleId, AstId}; #[derive(Debug, PartialEq, Eq)] pub(super) enum DefDiagnostic { UnresolvedModule { - module: CrateModuleId, + module: LocalModuleId, declaration: AstId, candidate: RelativePathBuf, }, @@ -332,7 +332,7 @@ mod diagnostics { pub(super) fn add_to( &self, db: &impl DefDatabase, - target_module: CrateModuleId, + target_module: LocalModuleId, sink: &mut DiagnosticSink, ) { match self { diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 4a671b8f3..5f7697f63 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs @@ -19,9 +19,9 @@ use crate::{ per_ns::PerNs, raw, CrateDefMap, ModuleData, Resolution, ResolveMode, }, path::{Path, PathKind}, - AdtId, AstId, AstItemDef, ConstLoc, ContainerId, CrateModuleId, EnumId, EnumVariantId, - FunctionLoc, ImplId, Intern, LocalImportId, LocationCtx, ModuleDefId, ModuleId, StaticId, - StructId, StructOrUnionId, TraitId, TypeAliasLoc, UnionId, + AdtId, AstId, AstItemDef, ConstLoc, ContainerId, EnumId, EnumVariantId, FunctionLoc, ImplId, + Intern, LocalImportId, LocalModuleId, LocationCtx, ModuleDefId, ModuleId, StaticId, StructId, + StructOrUnionId, TraitId, TypeAliasLoc, UnionId, }; pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap { @@ -94,10 +94,10 @@ impl MacroStackMonitor { struct DefCollector<'a, DB> { db: &'a DB, def_map: CrateDefMap, - glob_imports: FxHashMap>, - unresolved_imports: Vec<(CrateModuleId, LocalImportId, raw::ImportData)>, - unexpanded_macros: Vec<(CrateModuleId, AstId, Path)>, - mod_dirs: FxHashMap, + glob_imports: FxHashMap>, + unresolved_imports: Vec<(LocalModuleId, LocalImportId, raw::ImportData)>, + unexpanded_macros: Vec<(LocalModuleId, AstId, Path)>, + mod_dirs: FxHashMap, /// Some macro use `$tt:tt which mean we have to handle the macro perfectly /// To prevent stack overflow, we add a deep counter here for prevent that. @@ -173,7 +173,7 @@ where /// ``` fn define_macro( &mut self, - module_id: CrateModuleId, + module_id: LocalModuleId, name: Name, macro_: MacroDefId, export: bool, @@ -200,7 +200,7 @@ where /// the definition of current module. /// And also, `macro_use` on a module will import all legacy macros visable inside to /// current legacy scope, with possible shadowing. - fn define_legacy_macro(&mut self, module_id: CrateModuleId, name: Name, macro_: MacroDefId) { + fn define_legacy_macro(&mut self, module_id: LocalModuleId, name: Name, macro_: MacroDefId) { // Always shadowing self.def_map.modules[module_id].scope.legacy_macros.insert(name, macro_); } @@ -208,7 +208,7 @@ where /// Import macros from `#[macro_use] extern crate`. fn import_macros_from_extern_crate( &mut self, - current_module_id: CrateModuleId, + current_module_id: LocalModuleId, import: &raw::ImportData, ) { log::debug!( @@ -235,7 +235,7 @@ where /// Exported macros are just all macros in the root module scope. /// Note that it contains not only all `#[macro_export]` macros, but also all aliases /// created by `use` in the root module, ignoring the visibility of `use`. - fn import_all_macros_exported(&mut self, current_module_id: CrateModuleId, krate: CrateId) { + fn import_all_macros_exported(&mut self, current_module_id: LocalModuleId, krate: CrateId) { let def_map = self.db.crate_def_map(krate); for (name, def) in def_map[def_map.root].scope.macros() { // `macro_use` only bring things into legacy scope. @@ -265,7 +265,7 @@ where fn resolve_import( &self, - module_id: CrateModuleId, + module_id: LocalModuleId, import: &raw::ImportData, ) -> (PerNs, ReachedFixedPoint) { log::debug!("resolving import: {:?} ({:?})", import, self.def_map.edition); @@ -291,7 +291,7 @@ where fn record_resolved_import( &mut self, - module_id: CrateModuleId, + module_id: LocalModuleId, def: PerNs, import_id: LocalImportId, import: &raw::ImportData, @@ -387,7 +387,7 @@ where fn update( &mut self, - module_id: CrateModuleId, + module_id: LocalModuleId, import: Option, resolutions: &[(Name, Resolution)], ) { @@ -396,7 +396,7 @@ where fn update_recursive( &mut self, - module_id: CrateModuleId, + module_id: LocalModuleId, import: Option, resolutions: &[(Name, Resolution)], depth: usize, @@ -484,7 +484,7 @@ where fn collect_macro_expansion( &mut self, - module_id: CrateModuleId, + module_id: LocalModuleId, macro_call_id: MacroCallId, macro_def_id: MacroDefId, ) { @@ -522,7 +522,7 @@ where /// Walks a single module, populating defs, imports and macros struct ModCollector<'a, D> { def_collector: D, - module_id: CrateModuleId, + module_id: LocalModuleId, file_id: HirFileId, raw_items: &'a raw::RawItems, mod_dir: ModDir, @@ -647,7 +647,7 @@ where name: Name, declaration: AstId, definition: Option, - ) -> CrateModuleId { + ) -> LocalModuleId { let modules = &mut self.def_collector.def_map.modules; let res = modules.alloc(ModuleData::default()); modules[res].parent = Some(self.module_id); @@ -772,7 +772,7 @@ where self.def_collector.unexpanded_macros.push((self.module_id, ast_id, path)); } - fn import_all_legacy_macros(&mut self, module_id: CrateModuleId) { + fn import_all_legacy_macros(&mut self, module_id: LocalModuleId) { let macros = self.def_collector.def_map[module_id].scope.legacy_macros.clone(); for (name, macro_) in macros { self.def_collector.define_legacy_macro(self.module_id, name.clone(), macro_); @@ -827,7 +827,7 @@ mod tests { let def_map = { let edition = db.crate_graph().edition(krate); - let mut modules: Arena = Arena::default(); + let mut modules: Arena = Arena::default(); let root = modules.alloc(ModuleData::default()); CrateDefMap { krate, diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/ra_hir_def/src/nameres/path_resolution.rs index 102009ac7..93b441f96 100644 --- a/crates/ra_hir_def/src/nameres/path_resolution.rs +++ b/crates/ra_hir_def/src/nameres/path_resolution.rs @@ -18,7 +18,7 @@ use crate::{ db::DefDatabase, nameres::{per_ns::PerNs, CrateDefMap}, path::{Path, PathKind}, - AdtId, CrateModuleId, EnumVariantId, ModuleDefId, ModuleId, + AdtId, EnumVariantId, LocalModuleId, ModuleDefId, ModuleId, }; #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -65,7 +65,7 @@ impl CrateDefMap { &self, db: &impl DefDatabase, mode: ResolveMode, - original_module: CrateModuleId, + original_module: LocalModuleId, path: &Path, ) -> ResolvePathResult { let mut segments = path.segments.iter().enumerate(); @@ -217,7 +217,7 @@ impl CrateDefMap { fn resolve_name_in_module( &self, db: &impl DefDatabase, - module: CrateModuleId, + module: LocalModuleId, name: &Name, ) -> PerNs { // Resolve in: diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs index b5053ba20..f0b86af7c 100644 --- a/crates/ra_hir_def/src/nameres/tests.rs +++ b/crates/ra_hir_def/src/nameres/tests.rs @@ -10,7 +10,7 @@ use insta::assert_snapshot; use ra_db::{fixture::WithFixture, SourceDatabase}; use test_utils::covers; -use crate::{db::DefDatabase, nameres::*, test_db::TestDB, CrateModuleId}; +use crate::{db::DefDatabase, nameres::*, test_db::TestDB, LocalModuleId}; fn def_map(fixtute: &str) -> String { let dm = compute_crate_def_map(fixtute); @@ -28,7 +28,7 @@ fn render_crate_def_map(map: &CrateDefMap) -> String { go(&mut buf, map, "\ncrate", map.root()); return buf.trim().to_string(); - fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: CrateModuleId) { + fn go(buf: &mut String, map: &CrateDefMap, path: &str, module: LocalModuleId) { *buf += path; *buf += "\n"; diff --git a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs index eb7b85c07..e11530062 100644 --- a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs @@ -665,7 +665,7 @@ fn unresolved_module_diagnostics() { @r###" [ UnresolvedModule { - module: CrateModuleId( + module: LocalModuleId( 0, ), declaration: AstId { 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::{ generics::GenericParams, nameres::{per_ns::PerNs, CrateDefMap}, path::{Path, PathKind}, - AdtId, AstItemDef, ConstId, ContainerId, CrateModuleId, DefWithBodyId, EnumId, EnumVariantId, - FunctionId, GenericDefId, ImplId, Lookup, ModuleDefId, ModuleId, StaticId, StructId, TraitId, - TypeAliasId, + AdtId, AstItemDef, ConstId, ContainerId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, + GenericDefId, ImplId, LocalModuleId, Lookup, ModuleDefId, ModuleId, StaticId, StructId, + TraitId, TypeAliasId, }; #[derive(Debug, Clone, Default)] @@ -30,7 +30,7 @@ pub struct Resolver { #[derive(Debug, Clone)] pub(crate) struct ModuleItemMap { crate_def_map: Arc, - module_id: CrateModuleId, + module_id: LocalModuleId, } #[derive(Debug, Clone)] @@ -330,7 +330,7 @@ impl Resolver { traits } - fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { + fn module(&self) -> Option<(&CrateDefMap, LocalModuleId)> { self.scopes.iter().rev().find_map(|scope| match scope { Scope::ModuleScope(m) => Some((&*m.crate_def_map, m.module_id)), @@ -466,7 +466,7 @@ impl Resolver { fn push_module_scope( self, crate_def_map: Arc, - module_id: CrateModuleId, + module_id: LocalModuleId, ) -> Resolver { self.push_scope(Scope::ModuleScope(ModuleItemMap { crate_def_map, module_id })) } -- cgit v1.2.3