diff options
author | Aleksey Kladov <[email protected]> | 2019-11-21 10:28:04 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-21 10:28:04 +0000 |
commit | 24964ca58e057b3f32d5cbb17d84e46f2a236ff6 (patch) | |
tree | b8b3f17fba8a26bb96a23e15f84730b0eaf658a7 /crates/ra_hir/src/source_binder.rs | |
parent | 0102fb41337ac0442e689d410bb424d215e9a7bd (diff) |
Move expr resolver to resolve
Diffstat (limited to 'crates/ra_hir/src/source_binder.rs')
-rw-r--r-- | crates/ra_hir/src/source_binder.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 5abb8d693..29c928d51 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs | |||
@@ -21,9 +21,9 @@ use ra_syntax::{ | |||
21 | 21 | ||
22 | use crate::{ | 22 | use crate::{ |
23 | db::HirDatabase, | 23 | db::HirDatabase, |
24 | expr::{self, BodySourceMap, ExprScopes, ScopeId}, | 24 | expr::{BodySourceMap, ExprScopes, ScopeId}, |
25 | ids::LocationCtx, | 25 | ids::LocationCtx, |
26 | resolve::{HasResolver, ScopeDef, TypeNs, ValueNs}, | 26 | resolve::{resolver_for_scope, HasResolver, ScopeDef, TypeNs, ValueNs}, |
27 | ty::method_resolution::{self, implements_trait}, | 27 | ty::method_resolution::{self, implements_trait}, |
28 | Adt, AssocItem, Const, DefWithBody, Either, Enum, EnumVariant, FromSource, Function, | 28 | Adt, AssocItem, Const, DefWithBody, Either, Enum, EnumVariant, FromSource, Function, |
29 | GenericParam, HasBody, HirFileId, Local, MacroDef, Module, Name, Path, Resolver, Static, | 29 | GenericParam, HasBody, HirFileId, Local, MacroDef, Module, Name, Path, Resolver, Static, |
@@ -160,7 +160,7 @@ impl SourceAnalyzer { | |||
160 | None => scope_for(&scopes, &source_map, node), | 160 | None => scope_for(&scopes, &source_map, node), |
161 | Some(offset) => scope_for_offset(&scopes, &source_map, node.with_value(offset)), | 161 | Some(offset) => scope_for_offset(&scopes, &source_map, node.with_value(offset)), |
162 | }; | 162 | }; |
163 | let resolver = expr::resolver_for_scope(db, def, scope); | 163 | let resolver = resolver_for_scope(db, def, scope); |
164 | SourceAnalyzer { | 164 | SourceAnalyzer { |
165 | resolver, | 165 | resolver, |
166 | body_owner: Some(def), | 166 | body_owner: Some(def), |