Reorganize name resolution

2019-03-16 17:17:50 +03:00
parent d4449945a0
commit 967a4b64af
14 changed files with 485 additions and 526 deletions
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -8,8 +8,7 @@ use crate::{
    Name, ScopesWithSourceMap, Ty, HirFileId,
    HirDatabase, PersistentHirDatabase,
    type_ref::TypeRef,
-    nameres::{ModuleScope, Namespace, lower::ImportId},
-    nameres::crate_def_map::ModuleId,
+    nameres::{ModuleScope, Namespace, ImportId, ModuleId},
    expr::{Body, BodySourceMap},
    ty::InferenceResult,
    adt::{EnumVariantId, StructFieldId, VariantDef},