diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-31 13:03:24 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-05-31 13:03:24 +0100 |
commit | 5579ba8af5a31591a16b8f0f43053f73d07fb8b8 (patch) | |
tree | 2a0f7e55e01edc9edb2c49c3a94d07da172b1b40 /crates/ra_hir_def/src/body/scope.rs | |
parent | d7071eae2cb78547b8345d4c6ba2731a5151c049 (diff) | |
parent | cc6ba84c400417af873462364ba5cd4f6b5ab1f6 (diff) |
Merge #4667
4667: Infer labelled breaks correctly r=flodiebold a=robojumper
Fixes #4663.
Co-authored-by: robojumper <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/body/scope.rs')
-rw-r--r-- | crates/ra_hir_def/src/body/scope.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index 09e92b74e..e48ff38f9 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs | |||
@@ -138,10 +138,10 @@ fn compute_block_scopes( | |||
138 | fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope: ScopeId) { | 138 | fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope: ScopeId) { |
139 | scopes.set_scope(expr, scope); | 139 | scopes.set_scope(expr, scope); |
140 | match &body[expr] { | 140 | match &body[expr] { |
141 | Expr::Block { statements, tail } => { | 141 | Expr::Block { statements, tail, .. } => { |
142 | compute_block_scopes(&statements, *tail, body, scopes, scope); | 142 | compute_block_scopes(&statements, *tail, body, scopes, scope); |
143 | } | 143 | } |
144 | Expr::For { iterable, pat, body: body_expr } => { | 144 | Expr::For { iterable, pat, body: body_expr, .. } => { |
145 | compute_expr_scopes(*iterable, body, scopes, scope); | 145 | compute_expr_scopes(*iterable, body, scopes, scope); |
146 | let scope = scopes.new_scope(scope); | 146 | let scope = scopes.new_scope(scope); |
147 | scopes.add_bindings(body, scope, *pat); | 147 | scopes.add_bindings(body, scope, *pat); |