1 files changed, 7 insertions, 11 deletions

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index d06cd5c69..4573a72ba 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -18,7 +18,6 @@ pub(crate) mod lower;
 
 use std::{time, sync::Arc};
 
-use ra_db::CrateId;
 use ra_arena::map::ArenaMap;
 use test_utils::tested_by;
 use rustc_hash::{FxHashMap, FxHashSet};
@@ -159,7 +158,7 @@ impl<T> PerNs<T> {
 struct Resolver<'a, DB> {
     db: &'a DB,
     input: &'a FxHashMap<ModuleId, Arc<LoweredModule>>,
-    krate: CrateId,
+    krate: Crate,
     module_tree: Arc<ModuleTree>,
     processed_imports: FxHashSet<(ModuleId, ImportId)>,
     result: ItemMap,
@@ -172,7 +171,7 @@ where
     fn new(
         db: &'a DB,
         input: &'a FxHashMap<ModuleId, Arc<LoweredModule>>,
-        krate: CrateId,
+        krate: Crate,
     ) -> Resolver<'a, DB> {
         let module_tree = db.module_tree(krate);
         Resolver {
@@ -219,7 +218,7 @@ where
             let crate_graph = self.db.crate_graph();
             if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file())
             {
-                let krate = Crate::new(crate_id);
+                let krate = Crate { crate_id };
                 for dep in krate.dependencies(self.db) {
                     if let Some(module) = dep.krate.root_module(self.db) {
                         let def = module.into();
@@ -331,23 +330,20 @@ enum ReachedFixedPoint {
 }
 
 impl ItemMap {
-    pub(crate) fn item_map_query(db: &impl HirDatabase, crate_id: CrateId) -> Arc<ItemMap> {
+    pub(crate) fn item_map_query(db: &impl HirDatabase, krate: Crate) -> Arc<ItemMap> {
         let start = time::Instant::now();
-        let module_tree = db.module_tree(crate_id);
+        let module_tree = db.module_tree(krate);
         let input = module_tree
             .modules()
             .map(|module_id| {
                 (
                     module_id,
-                    db.lower_module_module(Module {
-                        krate: crate_id,
-                        module_id,
-                    }),
+                    db.lower_module_module(Module { krate, module_id }),
                 )
             })
             .collect::<FxHashMap<_, _>>();
 
-        let resolver = Resolver::new(db, &input, crate_id);
+        let resolver = Resolver::new(db, &input, krate);
         let res = resolver.resolve();
         let elapsed = start.elapsed();
         log::info!("item_map: {:?}", elapsed);