From 171acad15b1eacdfb12612a7615f4f6b21e5bf99 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 25 Oct 2018 16:04:42 +0300 Subject: disable cancelation --- crates/ra_analysis/src/db/mod.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'crates/ra_analysis/src/db/mod.rs') diff --git a/crates/ra_analysis/src/db/mod.rs b/crates/ra_analysis/src/db/mod.rs index 1a9023697..a922995de 100644 --- a/crates/ra_analysis/src/db/mod.rs +++ b/crates/ra_analysis/src/db/mod.rs @@ -27,12 +27,14 @@ impl salsa::Database for RootDatabase { } } -pub(crate) fn check_canceled(db: &impl salsa::Database) -> Cancelable<()> { - if db.salsa_runtime().is_current_revision_canceled() { - Err(Canceled) - } else { - Ok(()) - } +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(()) + // } } impl salsa::ParallelDatabase for RootDatabase { -- cgit v1.2.3