language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 21:05:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make HirDatabase object-safe

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-03 22:15:31 +03:00
parent 395965351d
commit dbf9820e35
5 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_hir/src/db.rs
View file

@ -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) {}
}

4
crates/ra_hir/src/mock.rs
View file

@ -2,7 +2,7 @@ use std::{sync::Arc, panic};
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 @@ impl salsa::ParallelDatabase for MockDatabase {
}
}
impl CheckCanceled for MockDatabase {}
impl AsRef<HirInterner> for MockDatabase {
fn as_ref(&self) -> &HirInterner {
&self.interner