From 33debc40654be9e9061c53784f6c762b2fd21eba Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 17 May 2021 19:07:10 +0200 Subject: Update salsa --- crates/hir_ty/src/infer/expr.rs | 2 +- crates/hir_ty/src/traits.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/hir_ty/src') 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> { } fn infer_expr_inner(&mut self, tgt_expr: ExprId, expected: &Expectation) -> Ty { - self.db.check_canceled(); + self.db.unwind_if_cancelled(); let body = Arc::clone(&self.body); // avoid borrow checker problem let ty = match &body[tgt_expr] { diff --git a/crates/hir_ty/src/traits.rs b/crates/hir_ty/src/traits.rs index 294cb531c..f589b314b 100644 --- a/crates/hir_ty/src/traits.rs +++ b/crates/hir_ty/src/traits.rs @@ -112,7 +112,7 @@ fn solve( let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL); let should_continue = || { - context.db.check_canceled(); + db.unwind_if_cancelled(); let remaining = fuel.get(); fuel.set(remaining - 1); if remaining == 0 { -- cgit v1.2.3