bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/test_db.rs')
-rw-r--r--crates/hir-ty/src/test_db.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/hir-ty/src/test_db.rs b/crates/hir-ty/src/test_db.rs
index 0efb9c52fb..f37dd91d8e 100644
--- a/crates/hir-ty/src/test_db.rs
+++ b/crates/hir-ty/src/test_db.rs
@@ -3,7 +3,7 @@
use std::{fmt, panic, sync::Mutex};
use base_db::{
- salsa::{self, Durability},
+ ra_salsa::{self, Durability},
AnchoredPath, CrateId, FileLoader, FileLoaderDelegate, SourceDatabase, Upcast,
};
use hir_def::{db::DefDatabase, ModuleId};
@@ -14,7 +14,7 @@ use syntax::TextRange;
use test_utils::extract_annotations;
use triomphe::Arc;
-#[salsa::database(
+#[ra_salsa::database(
base_db::SourceRootDatabaseStorage,
base_db::SourceDatabaseStorage,
hir_expand::db::ExpandDatabaseStorage,
@@ -23,8 +23,8 @@ use triomphe::Arc;
crate::db::HirDatabaseStorage
)]
pub(crate) struct TestDB {
- storage: salsa::Storage<TestDB>,
- events: Mutex<Option<Vec<salsa::Event>>>,
+ storage: ra_salsa::Storage<TestDB>,
+ events: Mutex<Option<Vec<ra_salsa::Event>>>,
}
impl Default for TestDB {
@@ -54,8 +54,8 @@ impl Upcast<dyn DefDatabase> for TestDB {
}
}
-impl salsa::Database for TestDB {
- fn salsa_event(&self, event: salsa::Event) {
+impl ra_salsa::Database for TestDB {
+ fn salsa_event(&self, event: ra_salsa::Event) {
let mut events = self.events.lock().unwrap();
if let Some(events) = &mut *events {
events.push(event);
@@ -63,9 +63,9 @@ impl salsa::Database for TestDB {
}
}
-impl salsa::ParallelDatabase for TestDB {
- fn snapshot(&self) -> salsa::Snapshot<TestDB> {
- salsa::Snapshot::new(TestDB {
+impl ra_salsa::ParallelDatabase for TestDB {
+ fn snapshot(&self) -> ra_salsa::Snapshot<TestDB> {
+ ra_salsa::Snapshot::new(TestDB {
storage: self.storage.snapshot(),
events: Default::default(),
})
@@ -128,7 +128,7 @@ impl TestDB {
}
impl TestDB {
- pub(crate) fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event> {
+ pub(crate) fn log(&self, f: impl FnOnce()) -> Vec<ra_salsa::Event> {
*self.events.lock().unwrap() = Some(Vec::new());
f();
self.events.lock().unwrap().take().unwrap()
@@ -141,7 +141,7 @@ impl TestDB {
.filter_map(|e| match e.kind {
// This is pretty horrible, but `Debug` is the only way to inspect
// QueryDescriptor at the moment.
- salsa::EventKind::WillExecute { database_key } => {
+ ra_salsa::EventKind::WillExecute { database_key } => {
Some(format!("{:?}", database_key.debug(self)))
}
_ => None,