diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-02 10:47:22 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-02 10:47:22 +0000 |
| commit | 157156276b32c4edca337e6389dc70a203c7c681 (patch) | |
| tree | 4424b450134591652648d4709715655975fe3ba7 /crates/hir_ty/src/infer | |
| parent | 3c1fcfcd1b79430c1ea97eea4ce0c89c9c793cdb (diff) | |
| parent | 7202ce6c963f047b8890ee50acc5aaf5d65f175d (diff) | |
Merge #7516
7516: Revert "Use block_def_map in body lowering" r=jonas-schievink a=jonas-schievink
Reverts rust-analyzer/rust-analyzer#7506
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer')
| -rw-r--r-- | crates/hir_ty/src/infer/expr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index 12f1591c8..d7351d212 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
| @@ -137,7 +137,7 @@ impl<'a> InferenceContext<'a> { | |||
| 137 | 137 | ||
| 138 | self.coerce_merge_branch(&then_ty, &else_ty) | 138 | self.coerce_merge_branch(&then_ty, &else_ty) |
| 139 | } | 139 | } |
| 140 | Expr::Block { statements, tail, label, id: _ } => match label { | 140 | Expr::Block { statements, tail, label } => match label { |
| 141 | Some(_) => { | 141 | Some(_) => { |
| 142 | let break_ty = self.table.new_type_var(); | 142 | let break_ty = self.table.new_type_var(); |
| 143 | self.breakables.push(BreakableContext { | 143 | self.breakables.push(BreakableContext { |