re-enable cancelation

2 files changed, 7 insertions, 9 deletions

diff --git a/crates/ra_analysis/Cargo.toml b/crates/ra_analysis/Cargo.toml
index b9f9cd7a7..5d7915fa5 100644
--- a/crates/ra_analysis/Cargo.toml
+++ b/crates/ra_analysis/Cargo.toml
@@ -11,7 +11,7 @@ rayon = "1.0.2"
 fst = "0.3.1"
 ra_syntax = { path = "../ra_syntax" }
 ra_editor = { path = "../ra_editor" }
-salsa = "0.6.0"
+salsa = "0.6.2"
 rustc-hash = "1.0"
 
 [dev-dependencies]
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 {
     }
 }
 
-pub(crate) fn check_canceled(_db: &impl salsa::Database) -> Cancelable<()> {
-    // Disabled due to https://github.com/salsa-rs/salsa/issues/66
-    Ok(())
-    // if db.salsa_runtime().is_current_revision_canceled() {
-    //     Err(Canceled)
-    // } else {
-    //     Ok(())
-    // }
+pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> {
+    if db.salsa_runtime().is_current_revision_canceled() {
+        Err(Canceled)
+    } else {
+        Ok(())
+    }
 }
 
 impl salsa::ParallelDatabase for RootDatabase {