From dd45697e5396d4a6ac8e838e1f4f510c960b9c43 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 15 Jan 2019 15:06:45 +0300
Subject: update salsa

---
 crates/ra_db/Cargo.toml | 2 +-
 crates/ra_db/src/lib.rs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'crates/ra_db')

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 <aleksey.kladov@gmail.com>"]
 
 [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(())
     }
 
-- 
cgit v1.2.3