Use new Resolver API in type inference

2019-01-26 22:52:04 +01:00
parent 758bc72873
commit 6b076f1931
13 changed files with 297 additions and 251 deletions
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -55,13 +55,13 @@ pub use self::{
    name::Name,
    ids::{HirFileId, MacroCallId, MacroCallLoc, HirInterner},
    macros::{MacroDef, MacroInput, MacroExpansion},
-    nameres::{ItemMap, PerNs, Namespace, Resolution},
+    nameres::{ItemMap, PerNs, Namespace},
    ty::Ty,
    impl_block::{ImplBlock, ImplItem},
    docs::{Docs, Documentation},
    adt::AdtDef,
    expr::{ExprScopes, ScopesWithSyntaxMapping},
-    resolve::Resolver,
+    resolve::{Resolver, Resolution},
 };

 pub use self::code_model_api::{