aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_def
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-05-31 13:42:32 +0100
committerGitHub <[email protected]>2021-05-31 13:42:32 +0100
commite9a797748daa7e25cde66927b8907b2d976201a5 (patch)
tree438bb6e1a2c5e422ee18994d2e045480b429d549 /crates/hir_def
parentb8d269990c57634e77f4702afc91041bacb4816a (diff)
parentacb5c227ed2d2d52d67ab56a61e6944cd4d5de88 (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_def')
-rw-r--r--crates/hir_def/src/nameres/collector.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index 50b2b0af4..7f9fdb379 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
@@ -351,7 +351,7 @@ impl DefCollector<'_> {
351 let mut i = 0; 351 let mut i = 0;
352 'outer: loop { 352 'outer: loop {
353 loop { 353 loop {
354 self.db.check_canceled(); 354 self.db.unwind_if_cancelled();
355 loop { 355 loop {
356 if self.resolve_imports() == ReachedFixedPoint::Yes { 356 if self.resolve_imports() == ReachedFixedPoint::Yes {
357 break; 357 break;
@@ -836,7 +836,7 @@ impl DefCollector<'_> {
836 vis: Visibility, 836 vis: Visibility,
837 import_type: ImportType, 837 import_type: ImportType,
838 ) { 838 ) {
839 self.db.check_canceled(); 839 self.db.unwind_if_cancelled();
840 self.update_recursive(module_id, resolutions, vis, import_type, 0) 840 self.update_recursive(module_id, resolutions, vis, import_type, 0)
841 } 841 }
842 842