diff options
author | Aleksey Kladov <[email protected]> | 2019-04-13 08:49:01 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-04-13 08:49:01 +0100 |
commit | f4a94e74bcd6c8f9275a57a775e64314af1878da (patch) | |
tree | d10b8da727d6b581a78d79e660fe05218e5b80d3 /crates/ra_hir/src/expr.rs | |
parent | 30481808fbfea109f324dfaf93daaaebacc75333 (diff) |
fold ScopeWithSyntax into SourceAnalyzer
Diffstat (limited to 'crates/ra_hir/src/expr.rs')
-rw-r--r-- | crates/ra_hir/src/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 3806a3605..038a25a97 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs | |||
@@ -16,7 +16,7 @@ use crate::{ | |||
16 | }; | 16 | }; |
17 | use crate::{ path::GenericArgs, ty::primitive::{IntTy, UncertainIntTy, FloatTy, UncertainFloatTy}}; | 17 | use crate::{ path::GenericArgs, ty::primitive::{IntTy, UncertainIntTy, FloatTy, UncertainFloatTy}}; |
18 | 18 | ||
19 | pub use self::scope::{ExprScopes, ScopesWithSourceMap, ScopeEntryWithSyntax}; | 19 | pub use self::scope::{ExprScopes, ScopeEntryWithSyntax}; |
20 | 20 | ||
21 | pub(crate) mod scope; | 21 | pub(crate) mod scope; |
22 | 22 | ||
@@ -93,7 +93,7 @@ pub fn resolver_for_scope( | |||
93 | ) -> Resolver { | 93 | ) -> Resolver { |
94 | let mut r = body.owner.resolver(db); | 94 | let mut r = body.owner.resolver(db); |
95 | let scopes = db.expr_scopes(body.owner); | 95 | let scopes = db.expr_scopes(body.owner); |
96 | let scope_chain = scopes.scope_chain_for(scope_id).collect::<Vec<_>>(); | 96 | let scope_chain = scopes.scope_chain(scope_id).collect::<Vec<_>>(); |
97 | for scope in scope_chain.into_iter().rev() { | 97 | for scope in scope_chain.into_iter().rev() { |
98 | r = r.push_expr_scope(Arc::clone(&scopes), scope); | 98 | r = r.push_expr_scope(Arc::clone(&scopes), scope); |
99 | } | 99 | } |