From 2195d1db6d70d64383bec82819fab02891d09744 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 13 Mar 2019 16:38:02 +0300
Subject: Replace module_tree with CrateDefMap

---
 crates/ra_hir/src/ty/method_resolution.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index 94b757af2..7c77474b0 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -7,10 +7,12 @@ use std::sync::Arc;
 use rustc_hash::FxHashMap;
 
 use crate::{
-    HirDatabase, module_tree::ModuleId, Module, Crate, Name, Function, Trait,
+    HirDatabase, Module, Crate, Name, Function, Trait,
     ids::TraitId,
     impl_block::{ImplId, ImplBlock, ImplItem},
     ty::{AdtDef, Ty},
+    nameres::crate_def_map::ModuleId,
+
 };
 
 /// This is used as a key for indexing impls.
-- 
cgit v1.2.3


From 967a4b64af2f09e11108d28f11565fa0f3e583a5 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 16 Mar 2019 17:17:50 +0300
Subject: Reorganize name resolution

---
 crates/ra_hir/src/ty/method_resolution.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index 7c77474b0..1adf9eef9 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -11,7 +11,7 @@ use crate::{
     ids::TraitId,
     impl_block::{ImplId, ImplBlock, ImplItem},
     ty::{AdtDef, Ty},
-    nameres::crate_def_map::ModuleId,
+    nameres::ModuleId,
 
 };
 
-- 
cgit v1.2.3


From ee3cf6172b29a1dc0973800b5a4f97afa5eefd90 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 16 Mar 2019 18:57:53 +0300
Subject: rename ModuleId -> CrateModuleId

---
 crates/ra_hir/src/ty/method_resolution.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index 1adf9eef9..804824868 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -11,7 +11,7 @@ use crate::{
     ids::TraitId,
     impl_block::{ImplId, ImplBlock, ImplItem},
     ty::{AdtDef, Ty},
-    nameres::ModuleId,
+    nameres::CrateModuleId,
 
 };
 
@@ -35,10 +35,10 @@ impl TyFingerprint {
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct CrateImplBlocks {
-    /// To make sense of the ModuleIds, we need the source root.
+    /// To make sense of the CrateModuleIds, we need the source root.
     krate: Crate,
-    impls: FxHashMap<TyFingerprint, Vec<(ModuleId, ImplId)>>,
-    impls_by_trait: FxHashMap<TraitId, Vec<(ModuleId, ImplId)>>,
+    impls: FxHashMap<TyFingerprint, Vec<(CrateModuleId, ImplId)>>,
+    impls_by_trait: FxHashMap<TraitId, Vec<(CrateModuleId, ImplId)>>,
 }
 
 impl CrateImplBlocks {
-- 
cgit v1.2.3