diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-23 12:44:47 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-23 12:44:47 +0000 |
commit | bce55c749a65f268a156606fa7e8dc15821ee631 (patch) | |
tree | 2b9ba6289fc865889775dab7c6b029faea7161ab /crates/ra_hir/src/code_model_impl/krate.rs | |
parent | 331220fee2c8c6d9f6e87c371ab101baace205dc (diff) | |
parent | 3f0cf6ebe1a42c3a38f3ab8a7b2e10110ed91ee1 (diff) |
Merge #1026
1026: rename persistent hir database -> def database r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_impl/krate.rs')
-rw-r--r-- | crates/ra_hir/src/code_model_impl/krate.rs | 9 |
1 files changed, 3 insertions, 6 deletions
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 @@ | |||
1 | use crate::{ | 1 | use crate::{ |
2 | Crate, CrateDependency, AsName, Module, PersistentHirDatabase, | 2 | Crate, CrateDependency, AsName, Module, DefDatabase, |
3 | }; | 3 | }; |
4 | 4 | ||
5 | impl Crate { | 5 | impl Crate { |
6 | pub(crate) fn dependencies_impl( | 6 | pub(crate) fn dependencies_impl(&self, db: &impl DefDatabase) -> Vec<CrateDependency> { |
7 | &self, | ||
8 | db: &impl PersistentHirDatabase, | ||
9 | ) -> Vec<CrateDependency> { | ||
10 | let crate_graph = db.crate_graph(); | 7 | let crate_graph = db.crate_graph(); |
11 | crate_graph | 8 | crate_graph |
12 | .dependencies(self.crate_id) | 9 | .dependencies(self.crate_id) |
@@ -17,7 +14,7 @@ impl Crate { | |||
17 | }) | 14 | }) |
18 | .collect() | 15 | .collect() |
19 | } | 16 | } |
20 | pub(crate) fn root_module_impl(&self, db: &impl PersistentHirDatabase) -> Option<Module> { | 17 | pub(crate) fn root_module_impl(&self, db: &impl DefDatabase) -> Option<Module> { |
21 | let module_id = db.crate_def_map(*self).root(); | 18 | let module_id = db.crate_def_map(*self).root(); |
22 | let module = Module { krate: *self, module_id }; | 19 | let module = Module { krate: *self, module_id }; |
23 | Some(module) | 20 | Some(module) |