diff options
| author | Aleksey Kladov <[email protected]> | 2018-10-25 15:22:31 +0100 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2018-10-25 15:22:31 +0100 |
| commit | 75d9cbd7c22b09a0bc2731731228c95ae60573c3 (patch) | |
| tree | e1762a8d237e0903643d455366de4d94eecf0454 /crates/ra_analysis/src | |
| parent | 772acb53f2d7568ff1cc2ba4ca84a47110f13b3a (diff) | |
re-enable cancelation
Diffstat (limited to 'crates/ra_analysis/src')
| -rw-r--r-- | crates/ra_analysis/src/db/mod.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/crates/ra_analysis/src/db/mod.rs b/crates/ra_analysis/src/db/mod.rs index a922995de..1a9023697 100644 --- a/crates/ra_analysis/src/db/mod.rs +++ b/crates/ra_analysis/src/db/mod.rs | |||
| @@ -27,14 +27,12 @@ impl salsa::Database for RootDatabase { | |||
| 27 | } | 27 | } |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | pub(crate) fn check_canceled(_db: &impl salsa::Database) -> Cancelable<()> { | 30 | pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> { |
| 31 | // Disabled due to https://github.com/salsa-rs/salsa/issues/66 | 31 | if db.salsa_runtime().is_current_revision_canceled() { |
| 32 | Ok(()) | 32 | Err(Canceled) |
| 33 | // if db.salsa_runtime().is_current_revision_canceled() { | 33 | } else { |
| 34 | // Err(Canceled) | 34 | Ok(()) |
| 35 | // } else { | 35 | } |
| 36 | // Ok(()) | ||
| 37 | // } | ||
| 38 | } | 36 | } |
| 39 | 37 | ||
| 40 | impl salsa::ParallelDatabase for RootDatabase { | 38 | impl salsa::ParallelDatabase for RootDatabase { |