diff options
| author | Jonas Schievink <[email protected]> | 2021-05-17 18:07:10 +0100 |
|---|---|---|
| committer | Jonas Schievink <[email protected]> | 2021-05-27 14:05:41 +0100 |
| commit | 33debc40654be9e9061c53784f6c762b2fd21eba (patch) | |
| tree | def63d3cc42fe48b1dfdf716c2e8e56de5324dab /crates/hir_def | |
| parent | d0a4ba294ccf0c925a5ff1115c19a60c6a24b734 (diff) | |
Update salsa
Diffstat (limited to 'crates/hir_def')
| -rw-r--r-- | crates/hir_def/src/nameres/collector.rs | 4 |
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 4296c6304..716dcf1f7 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; |
| @@ -831,7 +831,7 @@ impl DefCollector<'_> { | |||
| 831 | vis: Visibility, | 831 | vis: Visibility, |
| 832 | import_type: ImportType, | 832 | import_type: ImportType, |
| 833 | ) { | 833 | ) { |
| 834 | self.db.check_canceled(); | 834 | self.db.unwind_if_cancelled(); |
| 835 | self.update_recursive(module_id, resolutions, vis, import_type, 0) | 835 | self.update_recursive(module_id, resolutions, vis, import_type, 0) |
| 836 | } | 836 | } |
| 837 | 837 | ||