diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-21 23:28:47 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-21 23:28:47 +0000 |
commit | 4e4ca27eabac6a9c97dc07baf9a067efdfc63384 (patch) | |
tree | 83c75bdefa688a220054bf671ffe1692887d6dd4 /crates/ra_hir/src/function | |
parent | e4d0930d9c6478f7aa069401fb7e28ab7c80fd14 (diff) | |
parent | ea763c73b8d89edbf716805c62cf31b00e2e1a4f (diff) |
Merge #319
319: Completion icons r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/function')
-rw-r--r-- | crates/ra_hir/src/function/scope.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_hir/src/function/scope.rs b/crates/ra_hir/src/function/scope.rs index 9f1aa1ef2..77be25f1a 100644 --- a/crates/ra_hir/src/function/scope.rs +++ b/crates/ra_hir/src/function/scope.rs | |||
@@ -95,7 +95,7 @@ impl FnScopes { | |||
95 | r1.start().cmp(&r2.start()) | 95 | r1.start().cmp(&r2.start()) |
96 | } | 96 | } |
97 | }) | 97 | }) |
98 | .map(|(ptr, scope)| *scope) | 98 | .map(|(_ptr, scope)| *scope) |
99 | .unwrap_or(original_scope) | 99 | .unwrap_or(original_scope) |
100 | } | 100 | } |
101 | 101 | ||
@@ -209,7 +209,6 @@ fn compute_block_scopes(block: ast::Block, scopes: &mut FnScopes, mut scope: Sco | |||
209 | } | 209 | } |
210 | } | 210 | } |
211 | if let Some(expr) = block.expr() { | 211 | if let Some(expr) = block.expr() { |
212 | eprintln!("{:?}", expr); | ||
213 | scopes.set_scope(expr.syntax(), scope); | 212 | scopes.set_scope(expr.syntax(), scope); |
214 | compute_expr_scopes(expr, scopes, scope); | 213 | compute_expr_scopes(expr, scopes, scope); |
215 | } | 214 | } |