aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_analysis')
-rw-r--r--crates/ra_analysis/Cargo.toml2
-rw-r--r--crates/ra_analysis/src/db/mod.rs14
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"
11fst = "0.3.1" 11fst = "0.3.1"
12ra_syntax = { path = "../ra_syntax" } 12ra_syntax = { path = "../ra_syntax" }
13ra_editor = { path = "../ra_editor" } 13ra_editor = { path = "../ra_editor" }
14salsa = "0.6.0" 14salsa = "0.6.2"
15rustc-hash = "1.0" 15rustc-hash = "1.0"
16 16
17[dev-dependencies] 17[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 {
27 } 27 }
28} 28}
29 29
30pub(crate) fn check_canceled(_db: &impl salsa::Database) -> Cancelable<()> { 30pub(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
40impl salsa::ParallelDatabase for RootDatabase { 38impl salsa::ParallelDatabase for RootDatabase {