From ed20a857f485a471369cd99b843af19a4d875ad0 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 13 Aug 2020 16:25:38 +0200
Subject: Rename ra_db -> base_db

---
 crates/ra_hir_def/src/test_db.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'crates/ra_hir_def/src/test_db.rs')

diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/ra_hir_def/src/test_db.rs
index 339f819b8..42a762936 100644
--- a/crates/ra_hir_def/src/test_db.rs
+++ b/crates/ra_hir_def/src/test_db.rs
@@ -5,15 +5,15 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, Upcast};
 use hir_expand::db::AstDatabase;
-use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, Upcast};
 use rustc_hash::FxHashSet;
 
 use crate::db::DefDatabase;
 
 #[salsa::database(
-    ra_db::SourceDatabaseExtStorage,
-    ra_db::SourceDatabaseStorage,
+    base_db::SourceDatabaseExtStorage,
+    base_db::SourceDatabaseStorage,
     hir_expand::db::AstDatabaseStorage,
     crate::db::InternDatabaseStorage,
     crate::db::DefDatabaseStorage
-- 
cgit v1.2.3


From b28c54a2c239acd73f2eea80fda9ee3960d2c046 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 13 Aug 2020 16:28:27 +0200
Subject: Rename ra_hir_def -> hir_def

---
 crates/ra_hir_def/src/test_db.rs | 101 ---------------------------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 crates/ra_hir_def/src/test_db.rs

(limited to 'crates/ra_hir_def/src/test_db.rs')

diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/ra_hir_def/src/test_db.rs
deleted file mode 100644
index 42a762936..000000000
--- a/crates/ra_hir_def/src/test_db.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-//! Database used for testing `hir_def`.
-
-use std::{
-    fmt, panic,
-    sync::{Arc, Mutex},
-};
-
-use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, Upcast};
-use hir_expand::db::AstDatabase;
-use rustc_hash::FxHashSet;
-
-use crate::db::DefDatabase;
-
-#[salsa::database(
-    base_db::SourceDatabaseExtStorage,
-    base_db::SourceDatabaseStorage,
-    hir_expand::db::AstDatabaseStorage,
-    crate::db::InternDatabaseStorage,
-    crate::db::DefDatabaseStorage
-)]
-#[derive(Default)]
-pub struct TestDB {
-    storage: salsa::Storage<TestDB>,
-    events: Mutex<Option<Vec<salsa::Event>>>,
-}
-
-impl Upcast<dyn AstDatabase> for TestDB {
-    fn upcast(&self) -> &(dyn AstDatabase + 'static) {
-        &*self
-    }
-}
-
-impl Upcast<dyn DefDatabase> for TestDB {
-    fn upcast(&self) -> &(dyn DefDatabase + 'static) {
-        &*self
-    }
-}
-
-impl salsa::Database for TestDB {
-    fn salsa_event(&self, event: salsa::Event) {
-        let mut events = self.events.lock().unwrap();
-        if let Some(events) = &mut *events {
-            events.push(event);
-        }
-    }
-}
-
-impl fmt::Debug for TestDB {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("TestDB").finish()
-    }
-}
-
-impl panic::RefUnwindSafe for TestDB {}
-
-impl FileLoader for TestDB {
-    fn file_text(&self, file_id: FileId) -> Arc<String> {
-        FileLoaderDelegate(self).file_text(file_id)
-    }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
-    }
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
-        FileLoaderDelegate(self).relevant_crates(file_id)
-    }
-}
-
-impl TestDB {
-    pub fn module_for_file(&self, file_id: FileId) -> crate::ModuleId {
-        for &krate in self.relevant_crates(file_id).iter() {
-            let crate_def_map = self.crate_def_map(krate);
-            for (local_id, data) in crate_def_map.modules.iter() {
-                if data.origin.file_id() == Some(file_id) {
-                    return crate::ModuleId { krate, local_id };
-                }
-            }
-        }
-        panic!("Can't find module for file")
-    }
-
-    pub fn log(&self, f: impl FnOnce()) -> Vec<salsa::Event> {
-        *self.events.lock().unwrap() = Some(Vec::new());
-        f();
-        self.events.lock().unwrap().take().unwrap()
-    }
-
-    pub fn log_executed(&self, f: impl FnOnce()) -> Vec<String> {
-        let events = self.log(f);
-        events
-            .into_iter()
-            .filter_map(|e| match e.kind {
-                // This pretty horrible, but `Debug` is the only way to inspect
-                // QueryDescriptor at the moment.
-                salsa::EventKind::WillExecute { database_key } => {
-                    Some(format!("{:?}", database_key.debug(self)))
-                }
-                _ => None,
-            })
-            .collect()
-    }
-}
-- 
cgit v1.2.3