diff options
| author | Aleksey Kladov <[email protected]> | 2018-10-25 14:04:42 +0100 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2018-10-25 14:25:40 +0100 |
| commit | 171acad15b1eacdfb12612a7615f4f6b21e5bf99 (patch) | |
| tree | 6e5efa31268f1d74b371b0d4dbffd31089882428 /crates/ra_analysis/src | |
| parent | 56df0fc83c753b7fb8829438c8d3017ef1bf450c (diff) | |
disable cancelation
Diffstat (limited to 'crates/ra_analysis/src')
| -rw-r--r-- | crates/ra_analysis/src/db/mod.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crates/ra_analysis/src/db/mod.rs b/crates/ra_analysis/src/db/mod.rs index 1a9023697..a922995de 100644 --- a/crates/ra_analysis/src/db/mod.rs +++ b/crates/ra_analysis/src/db/mod.rs | |||
| @@ -27,12 +27,14 @@ 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 | if db.salsa_runtime().is_current_revision_canceled() { | 31 | // Disabled due to https://github.com/salsa-rs/salsa/issues/66 |
| 32 | Err(Canceled) | 32 | Ok(()) |
| 33 | } else { | 33 | // if db.salsa_runtime().is_current_revision_canceled() { |
| 34 | Ok(()) | 34 | // Err(Canceled) |
| 35 | } | 35 | // } else { |
| 36 | // Ok(()) | ||
| 37 | // } | ||
| 36 | } | 38 | } |
| 37 | 39 | ||
| 38 | impl salsa::ParallelDatabase for RootDatabase { | 40 | impl salsa::ParallelDatabase for RootDatabase { |