From fc1e543f7abb69b8cab308410fa0a127950ee1c5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 23 Nov 2019 14:44:43 +0300 Subject: Get rid of DefDatabase2 --- crates/ra_hir_def/src/nameres/collector.rs | 12 ++++++------ crates/ra_hir_def/src/nameres/mod_resolution.rs | 4 ++-- crates/ra_hir_def/src/nameres/path_resolution.rs | 8 ++++---- crates/ra_hir_def/src/nameres/raw.rs | 6 +++--- crates/ra_hir_def/src/nameres/tests.rs | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'crates/ra_hir_def/src/nameres') 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; use crate::{ attr::Attrs, - db::DefDatabase2, + db::DefDatabase, nameres::{ diagnostics::DefDiagnostic, mod_resolution::ModDir, path_resolution::ReachedFixedPoint, per_ns::PerNs, raw, CrateDefMap, ModuleData, Resolution, ResolveMode, @@ -24,7 +24,7 @@ use crate::{ StructOrUnionId, TraitId, TypeAliasLoc, UnionId, }; -pub(super) fn collect_defs(db: &impl DefDatabase2, mut def_map: CrateDefMap) -> CrateDefMap { +pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap { let crate_graph = db.crate_graph(); // populate external prelude @@ -108,7 +108,7 @@ struct DefCollector<'a, DB> { impl DefCollector<'_, DB> where - DB: DefDatabase2, + DB: DefDatabase, { fn collect(&mut self) { let crate_graph = self.db.crate_graph(); @@ -530,7 +530,7 @@ struct ModCollector<'a, D> { impl ModCollector<'_, &'_ mut DefCollector<'_, DB>> where - DB: DefDatabase2, + DB: DefDatabase, { fn collect(&mut self, items: &[raw::RawItem]) { // Note: don't assert that inserted value is fresh: it's simply not true @@ -798,12 +798,12 @@ mod tests { use ra_db::{fixture::WithFixture, SourceDatabase}; use rustc_hash::FxHashSet; - use crate::{db::DefDatabase2, test_db::TestDB}; + use crate::{db::DefDatabase, test_db::TestDB}; use super::*; fn do_collect_defs( - db: &impl DefDatabase2, + db: &impl DefDatabase, def_map: CrateDefMap, monitor: MacroStackMonitor, ) -> CrateDefMap { diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs index b3b1379d0..14fb8ba3a 100644 --- a/crates/ra_hir_def/src/nameres/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs @@ -3,7 +3,7 @@ use hir_expand::name::Name; use ra_db::{FileId, RelativePathBuf}; use ra_syntax::SmolStr; -use crate::{db::DefDatabase2, HirFileId}; +use crate::{db::DefDatabase, HirFileId}; #[derive(Clone, Debug)] pub(super) struct ModDir { @@ -40,7 +40,7 @@ impl ModDir { pub(super) fn resolve_declaration( &self, - db: &impl DefDatabase2, + db: &impl DefDatabase, file_id: HirFileId, name: &Name, attr_path: Option<&SmolStr>, diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/ra_hir_def/src/nameres/path_resolution.rs index 95692f826..102009ac7 100644 --- a/crates/ra_hir_def/src/nameres/path_resolution.rs +++ b/crates/ra_hir_def/src/nameres/path_resolution.rs @@ -15,7 +15,7 @@ use ra_db::Edition; use test_utils::tested_by; use crate::{ - db::DefDatabase2, + db::DefDatabase, nameres::{per_ns::PerNs, CrateDefMap}, path::{Path, PathKind}, AdtId, CrateModuleId, EnumVariantId, ModuleDefId, ModuleId, @@ -63,7 +63,7 @@ impl CrateDefMap { // the result. pub(super) fn resolve_path_fp_with_macro( &self, - db: &impl DefDatabase2, + db: &impl DefDatabase, mode: ResolveMode, original_module: CrateModuleId, path: &Path, @@ -216,7 +216,7 @@ impl CrateDefMap { fn resolve_name_in_module( &self, - db: &impl DefDatabase2, + db: &impl DefDatabase, module: CrateModuleId, name: &Name, ) -> PerNs { @@ -243,7 +243,7 @@ impl CrateDefMap { from_crate_root.or(from_extern_prelude) } - fn resolve_in_prelude(&self, db: &impl DefDatabase2, name: &Name) -> PerNs { + fn resolve_in_prelude(&self, db: &impl DefDatabase, name: &Name) -> PerNs { if let Some(prelude) = self.prelude { let keep; let def_map = if prelude.krate == self.krate { diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs index 55a9634f8..7618cb059 100644 --- a/crates/ra_hir_def/src/nameres/raw.rs +++ b/crates/ra_hir_def/src/nameres/raw.rs @@ -18,7 +18,7 @@ use test_utils::tested_by; use crate::{ attr::{Attr, Attrs}, - db::DefDatabase2, + db::DefDatabase, path::Path, FileAstId, HirFileId, ModuleSource, Source, }; @@ -67,14 +67,14 @@ impl ImportSourceMap { impl RawItems { pub(crate) fn raw_items_query( - db: &(impl DefDatabase2 + AstDatabase), + db: &(impl DefDatabase + AstDatabase), file_id: HirFileId, ) -> Arc { db.raw_items_with_source_map(file_id).0 } pub(crate) fn raw_items_with_source_map_query( - db: &(impl DefDatabase2 + AstDatabase), + db: &(impl DefDatabase + AstDatabase), file_id: HirFileId, ) -> (Arc, Arc) { let mut collector = RawItemsCollector { diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs index 256f7d4be..b5053ba20 100644 --- a/crates/ra_hir_def/src/nameres/tests.rs +++ b/crates/ra_hir_def/src/nameres/tests.rs @@ -10,7 +10,7 @@ use insta::assert_snapshot; use ra_db::{fixture::WithFixture, SourceDatabase}; use test_utils::covers; -use crate::{db::DefDatabase2, nameres::*, test_db::TestDB, CrateModuleId}; +use crate::{db::DefDatabase, nameres::*, test_db::TestDB, CrateModuleId}; fn def_map(fixtute: &str) -> String { let dm = compute_crate_def_map(fixtute); -- cgit v1.2.3