2 files changed, 29 insertions, 11 deletions

diff --git a/crates/ra_hir/src/nameres/crate_def_map.rs b/crates/ra_hir/src/nameres/crate_def_map.rs
index 37b36719f..cc4955053 100644
--- a/crates/ra_hir/src/nameres/crate_def_map.rs
+++ b/crates/ra_hir/src/nameres/crate_def_map.rs
@@ -149,8 +149,16 @@ impl CrateDefMap {
         &self.problems
     }
 
-    pub(crate) fn modules<'a>(&'a self) -> impl Iterator<Item = ModuleId> + 'a {
-        self.modules.iter().map(|(id, _data)| id)
+    pub(crate) fn mk_module(&self, module_id: ModuleId) -> Module {
+        Module { krate: self.krate, module_id }
+    }
+
+    pub(crate) fn prelude(&self) -> Option<Module> {
+        self.prelude
+    }
+
+    pub(crate) fn extern_prelude(&self) -> &FxHashMap<Name, ModuleDef> {
+        &self.extern_prelude
     }
 
     pub(crate) fn find_module_by_source(
@@ -169,6 +177,16 @@ impl CrateDefMap {
         Some(module_id)
     }
 
+    pub(crate) fn resolve_path(
+        &self,
+        db: &impl PersistentHirDatabase,
+        original_module: ModuleId,
+        path: &Path,
+    ) -> (PerNs<ModuleDef>, Option<usize>) {
+        let res = self.resolve_path_fp(db, ResolveMode::Other, original_module, path);
+        (res.resolved_def, res.segment_index)
+    }
+
     // Returns Yes if we are sure that additions to `ItemMap` wouldn't change
     // the result.
     fn resolve_path_fp(
@@ -254,8 +272,8 @@ impl CrateDefMap {
                             kind: PathKind::Self_,
                         };
                         log::debug!("resolving {:?} in other crate", path);
-                        let item_map = db.item_map(module.krate);
-                        let (def, s) = item_map.resolve_path(db, *module, &path);
+                        let defp_map = db.crate_def_map(module.krate);
+                        let (def, s) = defp_map.resolve_path(db, module.module_id, &path);
                         return ResolvePathResult::with(
                             def,
                             ReachedFixedPoint::Yes,
@@ -313,7 +331,7 @@ impl CrateDefMap {
         from_crate_root.or(from_extern_prelude)
     }
 
-    fn resolve_name_in_module(
+    pub(crate) fn resolve_name_in_module(
         &self,
         db: &impl PersistentHirDatabase,
         module: ModuleId,
@@ -340,7 +358,7 @@ impl CrateDefMap {
             let resolution = if prelude.krate == self.krate {
                 self[prelude.module_id].scope.items.get(name).cloned()
             } else {
-                db.item_map(prelude.krate)[prelude.module_id].items.get(name).cloned()
+                db.crate_def_map(prelude.krate)[prelude.module_id].scope.items.get(name).cloned()
             };
             resolution.map(|r| r.def).unwrap_or_else(PerNs::none)
         } else {
diff --git a/crates/ra_hir/src/nameres/crate_def_map/collector.rs b/crates/ra_hir/src/nameres/crate_def_map/collector.rs
index 68f74b866..8b727e2c9 100644
--- a/crates/ra_hir/src/nameres/crate_def_map/collector.rs
+++ b/crates/ra_hir/src/nameres/crate_def_map/collector.rs
@@ -26,9 +26,9 @@ pub(super) fn collect_defs(
         }
         // look for the prelude
         if def_map.prelude.is_none() {
-            let item_map = db.item_map(dep.krate);
-            if item_map.prelude.is_some() {
-                def_map.prelude = item_map.prelude;
+            let map = db.crate_def_map(dep.krate);
+            if map.prelude.is_some() {
+                def_map.prelude = map.prelude;
             }
         }
     }
@@ -162,8 +162,8 @@ where
                     } else if m.krate != self.def_map.krate {
                         tested_by!(glob_across_crates);
                         // glob import from other crate => we can just import everything once
-                        let item_map = self.db.item_map(m.krate);
-                        let scope = &item_map[m.module_id];
+                        let item_map = self.db.crate_def_map(m.krate);
+                        let scope = &item_map[m.module_id].scope;
                         let items = scope
                             .items
                             .iter()