From 75d9cbd7c22b09a0bc2731731228c95ae60573c3 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 25 Oct 2018 17:22:31 +0300 Subject: re-enable cancelation --- crates/ra_analysis/src/db/mod.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'crates/ra_analysis/src') 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 { -- cgit v1.2.3