make HirDatabase object-safe

diff --git a/crates/ra_db/src/lib.rs b/crates/ra_db/src/lib.rs
index ca775030d0a57a10e89089dae03fba0a6199667b..926cf0bd598eed91888a1434673cb48a0b074633 100644 (file)
--- a/crates/ra_db/src/lib.rs
+++ b/crates/ra_db/src/lib.rs
@@ -19,7 +19,7 @@
     loc2id::LocationIntener,
 };
 
-pub trait CheckCanceled: salsa::Database + panic::RefUnwindSafe {
+pub trait CheckCanceled: panic::RefUnwindSafe {
     /// Aborts current query if there are pending changes.
     ///
     /// rust-analyzer needs to be able to answer semantic questions about the
@@ -33,16 +33,13 @@ pub trait CheckCanceled: salsa::Database + panic::RefUnwindSafe {
     ///
     /// We implement cancellation by panicking with a special value and catching
     /// it on the API boundary. Salsa explicitly supports this use-case.
-    fn check_canceled(&self) {
-        if self.salsa_runtime().is_current_revision_canceled() {
-            Canceled::throw()
-        }
-    }
+    fn check_canceled(&self);
 
-    fn catch_canceled<F: FnOnce(&Self) -> T + panic::UnwindSafe, T>(
-        &self,
-        f: F,
-    ) -> Result<T, Canceled> {
+    fn catch_canceled<F, T>(&self, f: F) -> Result<T, Canceled>
+    where
+        Self: Sized,
+        F: FnOnce(&Self) -> T + panic::UnwindSafe,
+    {
         panic::catch_unwind(|| f(self)).map_err(|err| match err.downcast::<Canceled>() {
             Ok(canceled) => *canceled,
             Err(payload) => panic::resume_unwind(payload),
@@ -50,6 +47,14 @@ fn catch_canceled<F: FnOnce(&Self) -> T + panic::UnwindSafe, T>(
     }
 }
 
+impl<T: salsa::Database + panic::RefUnwindSafe> CheckCanceled for T {
+    fn check_canceled(&self) {
+        if self.salsa_runtime().is_current_revision_canceled() {
+            Canceled::throw()
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct FilePosition {
     pub file_id: FileId,
@@ -65,7 +70,7 @@ pub struct FileRange {
 /// Database which stores all significant input facts: source code and project
 /// model. Everything else in rust-analyzer is derived from these queries.
 #[salsa::query_group(SourceDatabaseStorage)]
-pub trait SourceDatabase: salsa::Database + CheckCanceled {
+pub trait SourceDatabase: CheckCanceled {
     /// Text of the file.
     #[salsa::input]
     fn file_text(&self, file_id: FileId) -> Arc<String>;

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 6b21fe744af0814c4460498c2d992ba601053e67..e03632519bdf07cb46e410743ada572228add46f 100644 (file)
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -103,3 +103,8 @@ pub trait HirDatabase: PersistentHirDatabase {
     #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)]
     fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>;
 }
+
+#[test]
+fn hir_database_is_object_safe() {
+    fn _assert_object_safe(_: &dyn HirDatabase) {}
+}

diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 17bdd48c6fbe760145876a256125c70f3c97a881..00a07d1a18a252b841487516b78968a6e7f02f53 100644 (file)
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -2,7 +2,7 @@
 
 use parking_lot::Mutex;
 use ra_db::{
-    CheckCanceled, FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, SourceDatabase, salsa,
+    FilePosition, FileId, CrateGraph, SourceRoot, SourceRootId, SourceDatabase, salsa,
 };
 use relative_path::RelativePathBuf;
 use test_utils::{parse_fixture, CURSOR_MARKER, extract_offset};
@@ -159,8 +159,6 @@ fn snapshot(&self) -> salsa::Snapshot<MockDatabase> {
     }
 }
 
-impl CheckCanceled for MockDatabase {}
-
 impl AsRef<HirInterner> for MockDatabase {
     fn as_ref(&self) -> &HirInterner {
         &self.interner

diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index 3a9089c22b956eddf5c149b73d1af3f9fa84da28..00f4bdfd246654bfffc9342bbc3097e5e1578905 100644 (file)
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -60,8 +60,6 @@ fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
     }
 }
 
-impl CheckCanceled for RootDatabase {}
-
 impl AsRef<hir::HirInterner> for RootDatabase {
     fn as_ref(&self) -> &hir::HirInterner {
         &self.interner

diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index a087a2fff69db6ec3c92fc96b93d26ec756214cd..65941a5ca8d3c8e3c151792723441ae9c929244b 100644 (file)
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -9,6 +9,10 @@
 //!
 //! The sibling `ra_ide_api_light` handles thouse bits of IDE functionality
 //! which are restricted to a single file and need only syntax.
+
+// For proving that RootDatabase is RefUnwindSafe.
+#![recursion_limit = "128"]
+
 mod db;
 mod imp;
 pub mod mock_analysis;