rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

disable cancelation

Browse Source
This commit is contained in:
Aleksey Kladov
2018-10-25 16:04:42 +03:00
parent 56df0fc83c
commit 171acad15b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ra_analysis/src/db/mod.rs
View File

@@ -27,12 +27,14 @@ impl salsa::Database for RootDatabase {
} }
} }
pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> { pub(crate) fn check_canceled(_db: &impl salsa::Database) -> Cancelable<()> {
if db.salsa_runtime().is_current_revision_canceled() { // Disabled due to https://github.com/salsa-rs/salsa/issues/66
Err(Canceled) Ok(())
} else { // if db.salsa_runtime().is_current_revision_canceled() {
Ok(()) // Err(Canceled)
} // } else {
// Ok(())
// }
} }
impl salsa::ParallelDatabase for RootDatabase { impl salsa::ParallelDatabase for RootDatabase {