1 files changed, 14 insertions, 22 deletions

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 67adcfa28..b325979f5 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -56,8 +56,9 @@ mod tests;
 
 use std::sync::Arc;
 
+use hir_def::CrateModuleId;
 use once_cell::sync::Lazy;
-use ra_arena::{impl_arena_id, Arena, RawId};
+use ra_arena::Arena;
 use ra_db::{Edition, FileId};
 use ra_prof::profile;
 use ra_syntax::ast;
@@ -115,13 +116,8 @@ impl std::ops::Index<CrateModuleId> for CrateDefMap {
     }
 }
 
-/// An ID of a module, **local** to a specific crate
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub(crate) struct CrateModuleId(RawId);
-impl_arena_id!(CrateModuleId);
-
 #[derive(Default, Debug, PartialEq, Eq)]
-pub(crate) struct ModuleData {
+pub struct ModuleData {
     pub(crate) parent: Option<CrateModuleId>,
     pub(crate) children: FxHashMap<Name, CrateModuleId>,
     pub(crate) scope: ModuleScope,
@@ -335,7 +331,7 @@ impl CrateDefMap {
             PathKind::DollarCrate(krate) => {
                 if krate == self.krate {
                     tested_by!(macro_dollar_crate_self);
-                    PerNs::types(Module { krate: self.krate, module_id: self.root }.into())
+                    PerNs::types(Module::new(self.krate, self.root).into())
                 } else {
                     match krate.root_module(db) {
                         Some(module) => {
@@ -346,12 +342,8 @@ impl CrateDefMap {
                     }
                 }
             }
-            PathKind::Crate => {
-                PerNs::types(Module { krate: self.krate, module_id: self.root }.into())
-            }
-            PathKind::Self_ => {
-                PerNs::types(Module { krate: self.krate, module_id: original_module }.into())
-            }
+            PathKind::Crate => PerNs::types(Module::new(self.krate, self.root).into()),
+            PathKind::Self_ => PerNs::types(Module::new(self.krate, original_module).into()),
             // plain import or absolute path in 2015: crate-relative with
             // fallback to extern prelude (with the simplification in
             // rust-lang/rust#57745)
@@ -377,7 +369,7 @@ impl CrateDefMap {
             }
             PathKind::Super => {
                 if let Some(p) = self.modules[original_module].parent {
-                    PerNs::types(Module { krate: self.krate, module_id: p }.into())
+                    PerNs::types(Module::new(self.krate, p).into())
                 } else {
                     log::debug!("super path in root module");
                     return ResolvePathResult::empty(ReachedFixedPoint::Yes);
@@ -419,12 +411,12 @@ impl CrateDefMap {
 
             curr_per_ns = match curr {
                 ModuleDef::Module(module) => {
-                    if module.krate != self.krate {
+                    if module.krate() != self.krate {
                         let path =
                             Path { segments: path.segments[i..].to_vec(), kind: PathKind::Self_ };
                         log::debug!("resolving {:?} in other crate", path);
-                        let defp_map = db.crate_def_map(module.krate);
-                        let (def, s) = defp_map.resolve_path(db, module.module_id, &path);
+                        let defp_map = db.crate_def_map(module.krate());
+                        let (def, s) = defp_map.resolve_path(db, module.id.module_id, &path);
                         return ResolvePathResult::with(
                             def,
                             ReachedFixedPoint::Yes,
@@ -433,7 +425,7 @@ impl CrateDefMap {
                     }
 
                     // Since it is a qualified path here, it should not contains legacy macros
-                    match self[module.module_id].scope.get(&segment.name) {
+                    match self[module.id.module_id].scope.get(&segment.name) {
                         Some(res) => res.def,
                         _ => {
                             log::debug!("path segment {:?} not found", segment.name);
@@ -511,14 +503,14 @@ impl CrateDefMap {
     fn resolve_in_prelude(&self, db: &impl DefDatabase, name: &Name) -> PerNs {
         if let Some(prelude) = self.prelude {
             let keep;
-            let def_map = if prelude.krate == self.krate {
+            let def_map = if prelude.krate() == self.krate {
                 self
             } else {
                 // Extend lifetime
-                keep = db.crate_def_map(prelude.krate);
+                keep = db.crate_def_map(prelude.krate());
                 &keep
             };
-            def_map[prelude.module_id].scope.get(name).map_or_else(PerNs::none, |res| res.def)
+            def_map[prelude.id.module_id].scope.get(name).map_or_else(PerNs::none, |res| res.def)
         } else {
             PerNs::none()
         }