Merge #547

547: update salsa r=matklad a=matklad

Notably, this includes unwinding-based cancelation.

Co-authored-by: Aleksey Kladov <[email protected]>

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]>"]
 
 [dependencies]
 relative-path = "0.4.0"
-salsa = "0.9.1"
+salsa = "0.9.2"
 rustc-hash = "1.0"
 parking_lot = "0.7.0"
 ra_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::{
 
 pub trait BaseDatabase: salsa::Database + panic::RefUnwindSafe {
     fn check_canceled(&self) -> Cancelable<()> {
-        self.salsa_runtime()
-            .if_current_revision_is_canceled(Canceled::throw);
+        if self.salsa_runtime().is_current_revision_canceled() {
+            Canceled::throw()
+        }
         Ok(())
     }