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 | |
| 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')
| -rw-r--r-- | crates/hir/src/semantics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 8d3c43d08..c7f2c02e4 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs | |||
| @@ -361,7 +361,7 @@ impl<'db> SemanticsImpl<'db> { | |||
| 361 | let sa = self.analyze(&parent); | 361 | let sa = self.analyze(&parent); |
| 362 | 362 | ||
| 363 | let token = successors(Some(InFile::new(sa.file_id, token)), |token| { | 363 | let token = successors(Some(InFile::new(sa.file_id, token)), |token| { |
| 364 | self.db.check_canceled(); | 364 | self.db.unwind_if_cancelled(); |
| 365 | let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?; | 365 | let macro_call = token.value.ancestors().find_map(ast::MacroCall::cast)?; |
| 366 | let tt = macro_call.token_tree()?; | 366 | let tt = macro_call.token_tree()?; |
| 367 | if !tt.syntax().text_range().contains_range(token.value.text_range()) { | 367 | if !tt.syntax().text_range().contains_range(token.value.text_range()) { |