Merge #1026

1026: rename persistent hir database -> def database r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index c7bad7e2b..d3908f8ac 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -16,8 +16,8 @@ use crate::{
     type_ref::TypeRef,
 };
 
-#[salsa::query_group(PersistentHirDatabaseStorage)]
-pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> {
+#[salsa::query_group(DefDatabaseStorage)]
+pub trait DefDatabase: SourceDatabase + AsRef<HirInterner> {
     #[salsa::invoke(HirFileId::hir_parse)]
     fn hir_parse(&self, file_id: HirFileId) -> TreeArc<SourceFile>;
 
@@ -71,7 +71,7 @@ pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> {
 }
 
 #[salsa::query_group(HirDatabaseStorage)]
-pub trait HirDatabase: PersistentHirDatabase {
+pub trait HirDatabase: DefDatabase {
     #[salsa::invoke(ExprScopes::expr_scopes_query)]
     fn expr_scopes(&self, func: Function) -> Arc<ExprScopes>;