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/traits.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/traits.rs')
| -rw-r--r-- | crates/hir_ty/src/traits.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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( | |||
| 112 | let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL); | 112 | let fuel = std::cell::Cell::new(CHALK_SOLVER_FUEL); |
| 113 | 113 | ||
| 114 | let should_continue = || { | 114 | let should_continue = || { |
| 115 | context.db.check_canceled(); | 115 | db.unwind_if_cancelled(); |
| 116 | let remaining = fuel.get(); | 116 | let remaining = fuel.get(); |
| 117 | fuel.set(remaining - 1); | 117 | fuel.set(remaining - 1); |
| 118 | if remaining == 0 { | 118 | if remaining == 0 { |