aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_db
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-01-15 12:06:45 +0000
committerAleksey Kladov <[email protected]>2019-01-15 12:06:45 +0000
commitdd45697e5396d4a6ac8e838e1f4f510c960b9c43 (patch)
treef483dcc7745092c05b03e76b8b664591b730a359 /crates/ra_db
parentf6f2e89e7ac9c4afbda11bade21f902c552fbba2 (diff)
update salsa
Diffstat (limited to 'crates/ra_db')
-rw-r--r--crates/ra_db/Cargo.toml2
-rw-r--r--crates/ra_db/src/lib.rs5
2 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 2c1f94ad0..21d987688 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Aleksey Kladov <[email protected]>"]
6 6
7[dependencies] 7[dependencies]
8relative-path = "0.4.0" 8relative-path = "0.4.0"
9salsa = "0.9.1" 9salsa = "0.9.2"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11parking_lot = "0.7.0" 11parking_lot = "0.7.0"
12ra_arena = { path = "../ra_arena" } 12ra_arena = { path = "../ra_arena" }
diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index 0c4dfc8c6..0e7f32e66 100644
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -22,8 +22,9 @@ pub use crate::{
22 22
23pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe { 23pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe {
24 fn check_canceled(&self) -> Cancelable<()> { 24 fn check_canceled(&self) -> Cancelable<()> {
25 self.salsa_runtime() 25 if self.salsa_runtime().is_current_revision_canceled() {
26 .if_current_revision_is_canceled(Canceled::throw); 26 Canceled::throw()
27 }
27 Ok(()) 28 Ok(())
28 } 29 }
29 30