diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:46:18 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:46:18 +0000 |
| commit | 443ff27724855ffbfccad3513bb82d59e1a4f8ae (patch) | |
| tree | 684cec39e4dd7856c4738a4635ac5bce814efcd0 /crates/ra_ide_api | |
| parent | c7f072372edc7a94544c993d03928aab2ac92dab (diff) | |
| parent | fedd320cf284ec5d489e62bf809277cedd9f60ac (diff) | |
Merge #548
548: check_canceled does not return Result r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api')
| -rw-r--r-- | crates/ra_ide_api/src/symbol_index.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs index fdda57022..b7a3a3550 100644 --- a/crates/ra_ide_api/src/symbol_index.rs +++ b/crates/ra_ide_api/src/symbol_index.rs | |||
| @@ -54,7 +54,7 @@ salsa::query_group! { | |||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { | 56 | fn file_symbols(db: &impl SymbolsDatabase, file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { |
| 57 | db.check_canceled()?; | 57 | db.check_canceled(); |
| 58 | let source_file = db.source_file(file_id); | 58 | let source_file = db.source_file(file_id); |
| 59 | let mut symbols = source_file | 59 | let mut symbols = source_file |
| 60 | .syntax() | 60 | .syntax() |