Merge #1026

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



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

4 files changed, 14 insertions, 23 deletions

diff --git a/crates/ra_hir/src/code_model_impl/function.rs b/crates/ra_hir/src/code_model_impl/function.rs
index c1654b069..334cb302b 100644
--- a/crates/ra_hir/src/code_model_impl/function.rs
+++ b/crates/ra_hir/src/code_model_impl/function.rs
@@ -5,14 +5,11 @@ use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
 use crate::{
     Name, AsName, Function, FnSignature,
     type_ref::{TypeRef, Mutability},
-    PersistentHirDatabase,
+    DefDatabase,
 };
 
 impl FnSignature {
-    pub(crate) fn fn_signature_query(
-        db: &impl PersistentHirDatabase,
-        func: Function,
-    ) -> Arc<FnSignature> {
+    pub(crate) fn fn_signature_query(db: &impl DefDatabase, func: Function) -> Arc<FnSignature> {
         let (_, node) = func.source(db);
         let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
         let mut params = Vec::new();
diff --git a/crates/ra_hir/src/code_model_impl/konst.rs b/crates/ra_hir/src/code_model_impl/konst.rs
index 8b861a81f..db4e5ce5c 100644
--- a/crates/ra_hir/src/code_model_impl/konst.rs
+++ b/crates/ra_hir/src/code_model_impl/konst.rs
@@ -5,7 +5,7 @@ use ra_syntax::ast::{NameOwner, TypeAscriptionOwner};
 use crate::{

     Name, AsName, Const, ConstSignature, Static,

     type_ref::{TypeRef},

-    PersistentHirDatabase,

+    DefDatabase,

 };

 

 fn const_signature_for<N: NameOwner + TypeAscriptionOwner>(node: &N) -> Arc<ConstSignature> {

@@ -17,7 +17,7 @@ fn const_signature_for<N: NameOwner + TypeAscriptionOwner>(node: &N) -> Arc<Cons
 

 impl ConstSignature {

     pub(crate) fn const_signature_query(

-        db: &impl PersistentHirDatabase,

+        db: &impl DefDatabase,

         konst: Const,

     ) -> Arc<ConstSignature> {

         let (_, node) = konst.source(db);

@@ -25,7 +25,7 @@ impl ConstSignature {
     }

 

     pub(crate) fn static_signature_query(

-        db: &impl PersistentHirDatabase,

+        db: &impl DefDatabase,

         konst: Static,

     ) -> Arc<ConstSignature> {

         let (_, node) = konst.source(db);

diff --git a/crates/ra_hir/src/code_model_impl/krate.rs b/crates/ra_hir/src/code_model_impl/krate.rs
index cc87c6f14..914414fc3 100644
--- a/crates/ra_hir/src/code_model_impl/krate.rs
+++ b/crates/ra_hir/src/code_model_impl/krate.rs
@@ -1,12 +1,9 @@
 use crate::{
-    Crate, CrateDependency, AsName, Module, PersistentHirDatabase,
+    Crate, CrateDependency, AsName, Module, DefDatabase,
 };
 
 impl Crate {
-    pub(crate) fn dependencies_impl(
-        &self,
-        db: &impl PersistentHirDatabase,
-    ) -> Vec<CrateDependency> {
+    pub(crate) fn dependencies_impl(&self, db: &impl DefDatabase) -> Vec<CrateDependency> {
         let crate_graph = db.crate_graph();
         crate_graph
             .dependencies(self.crate_id)
@@ -17,7 +14,7 @@ impl Crate {
             })
             .collect()
     }
-    pub(crate) fn root_module_impl(&self, db: &impl PersistentHirDatabase) -> Option<Module> {
+    pub(crate) fn root_module_impl(&self, db: &impl DefDatabase) -> Option<Module> {
         let module_id = db.crate_def_map(*self).root();
         let module = Module { krate: *self, module_id };
         Some(module)
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs
index f7d15c55e..52a33e981 100644
--- a/crates/ra_hir/src/code_model_impl/module.rs
+++ b/crates/ra_hir/src/code_model_impl/module.rs
@@ -4,13 +4,13 @@ use ra_syntax::{ast, SyntaxNode, TreeArc, AstNode};
 use crate::{
     Module, ModuleSource, Problem, Name,
     nameres::{CrateModuleId, ImportId},
-    HirDatabase, PersistentHirDatabase,
+    HirDatabase, DefDatabase,
     HirFileId, SourceItemId,
 };
 
 impl ModuleSource {
     pub(crate) fn new(
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
         file_id: Option<FileId>,
         decl_id: Option<SourceItemId>,
     ) -> ModuleSource {
@@ -49,7 +49,7 @@ impl Module {
 
     pub(crate) fn definition_source_impl(
         &self,
-        db: &impl PersistentHirDatabase,
+        db: &impl DefDatabase,
     ) -> (HirFileId, ModuleSource) {
         let def_map = db.crate_def_map(self.krate);
         let decl_id = def_map[self.module_id].declaration;
@@ -80,7 +80,7 @@ impl Module {
         source_map.get(&source, import)
     }
 
-    pub(crate) fn crate_root_impl(&self, db: &impl PersistentHirDatabase) -> Module {
+    pub(crate) fn crate_root_impl(&self, db: &impl DefDatabase) -> Module {
         let def_map = db.crate_def_map(self.krate);
         self.with_module_id(def_map.root())
     }
@@ -93,10 +93,7 @@ impl Module {
     }
 
     /// Iterates over all child modules.
-    pub(crate) fn children_impl(
-        &self,
-        db: &impl PersistentHirDatabase,
-    ) -> impl Iterator<Item = Module> {
+    pub(crate) fn children_impl(&self, db: &impl DefDatabase) -> impl Iterator<Item = Module> {
         let def_map = db.crate_def_map(self.krate);
         let children = def_map[self.module_id]
             .children
@@ -106,7 +103,7 @@ impl Module {
         children.into_iter()
     }
 
-    pub(crate) fn parent_impl(&self, db: &impl PersistentHirDatabase) -> Option<Module> {
+    pub(crate) fn parent_impl(&self, db: &impl DefDatabase) -> Option<Module> {
         let def_map = db.crate_def_map(self.krate);
         let parent_id = def_map[self.module_id].parent?;
         Some(self.with_module_id(parent_id))