diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-31 13:42:32 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-31 13:42:32 +0100 |
| commit | e9a797748daa7e25cde66927b8907b2d976201a5 (patch) | |
| tree | 438bb6e1a2c5e422ee18994d2e045480b429d549 /crates/hir_ty/src/infer/expr.rs | |
| parent | b8d269990c57634e77f4702afc91041bacb4816a (diff) | |
| parent | acb5c227ed2d2d52d67ab56a61e6944cd4d5de88 (diff) | |
Merge #8866
8866: Update salsa r=matklad a=jonas-schievink
This updates salsa to include https://github.com/salsa-rs/salsa/pull/265, and removes all cancellation-related code from rust-analyzer
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer/expr.rs')
| -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 97507305c..41ef45326 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
| @@ -119,7 +119,7 @@ impl<'a> InferenceContext<'a> { | |||
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty { | 121 | fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty { |
| 122 | self.db.check_canceled(); | 122 | self.db.unwind_if_cancelled(); |
| 123 | 123 | ||
| 124 | let body = Arc::clone(&self.body); // avoid borrow checker problem | 124 | let body = Arc::clone(&self.body); // avoid borrow checker problem |
| 125 | let ty = match &body[tgt_expr] { | 125 | let ty = match &body[tgt_expr] { |