diff options
author | Aleksey Kladov <[email protected]> | 2019-11-23 11:44:43 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-23 11:49:45 +0000 |
commit | fc1e543f7abb69b8cab308410fa0a127950ee1c5 (patch) | |
tree | 5e30f4e18a0ea83215fd48776f372546dece9431 /crates/ra_hir_def/src/nameres/collector.rs | |
parent | 958862093e83083b188427246323047a2c9e7bab (diff) |
Get rid of DefDatabase2
Diffstat (limited to 'crates/ra_hir_def/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 7902293e8..1894b072a 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -13,7 +13,7 @@ use test_utils::tested_by; | |||
13 | 13 | ||
14 | use crate::{ | 14 | use crate::{ |
15 | attr::Attrs, | 15 | attr::Attrs, |
16 | db::DefDatabase2, | 16 | db::DefDatabase, |
17 | nameres::{ | 17 | nameres::{ |
18 | diagnostics::DefDiagnostic, mod_resolution::ModDir, path_resolution::ReachedFixedPoint, | 18 | diagnostics::DefDiagnostic, mod_resolution::ModDir, path_resolution::ReachedFixedPoint, |
19 | per_ns::PerNs, raw, CrateDefMap, ModuleData, Resolution, ResolveMode, | 19 | per_ns::PerNs, raw, CrateDefMap, ModuleData, Resolution, ResolveMode, |
@@ -24,7 +24,7 @@ use crate::{ | |||
24 | StructOrUnionId, TraitId, TypeAliasLoc, UnionId, | 24 | StructOrUnionId, TraitId, TypeAliasLoc, UnionId, |
25 | }; | 25 | }; |
26 | 26 | ||
27 | pub(super) fn collect_defs(db: &impl DefDatabase2, mut def_map: CrateDefMap) -> CrateDefMap { | 27 | pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap { |
28 | let crate_graph = db.crate_graph(); | 28 | let crate_graph = db.crate_graph(); |
29 | 29 | ||
30 | // populate external prelude | 30 | // populate external prelude |
@@ -108,7 +108,7 @@ struct DefCollector<'a, DB> { | |||
108 | 108 | ||
109 | impl<DB> DefCollector<'_, DB> | 109 | impl<DB> DefCollector<'_, DB> |
110 | where | 110 | where |
111 | DB: DefDatabase2, | 111 | DB: DefDatabase, |
112 | { | 112 | { |
113 | fn collect(&mut self) { | 113 | fn collect(&mut self) { |
114 | let crate_graph = self.db.crate_graph(); | 114 | let crate_graph = self.db.crate_graph(); |
@@ -530,7 +530,7 @@ struct ModCollector<'a, D> { | |||
530 | 530 | ||
531 | impl<DB> ModCollector<'_, &'_ mut DefCollector<'_, DB>> | 531 | impl<DB> ModCollector<'_, &'_ mut DefCollector<'_, DB>> |
532 | where | 532 | where |
533 | DB: DefDatabase2, | 533 | DB: DefDatabase, |
534 | { | 534 | { |
535 | fn collect(&mut self, items: &[raw::RawItem]) { | 535 | fn collect(&mut self, items: &[raw::RawItem]) { |
536 | // Note: don't assert that inserted value is fresh: it's simply not true | 536 | // Note: don't assert that inserted value is fresh: it's simply not true |
@@ -798,12 +798,12 @@ mod tests { | |||
798 | use ra_db::{fixture::WithFixture, SourceDatabase}; | 798 | use ra_db::{fixture::WithFixture, SourceDatabase}; |
799 | use rustc_hash::FxHashSet; | 799 | use rustc_hash::FxHashSet; |
800 | 800 | ||
801 | use crate::{db::DefDatabase2, test_db::TestDB}; | 801 | use crate::{db::DefDatabase, test_db::TestDB}; |
802 | 802 | ||
803 | use super::*; | 803 | use super::*; |
804 | 804 | ||
805 | fn do_collect_defs( | 805 | fn do_collect_defs( |
806 | db: &impl DefDatabase2, | 806 | db: &impl DefDatabase, |
807 | def_map: CrateDefMap, | 807 | def_map: CrateDefMap, |
808 | monitor: MacroStackMonitor, | 808 | monitor: MacroStackMonitor, |
809 | ) -> CrateDefMap { | 809 | ) -> CrateDefMap { |