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/path_resolution.rs | |
parent | 958862093e83083b188427246323047a2c9e7bab (diff) |
Get rid of DefDatabase2
Diffstat (limited to 'crates/ra_hir_def/src/nameres/path_resolution.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres/path_resolution.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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; | |||
15 | use test_utils::tested_by; | 15 | use test_utils::tested_by; |
16 | 16 | ||
17 | use crate::{ | 17 | use crate::{ |
18 | db::DefDatabase2, | 18 | db::DefDatabase, |
19 | nameres::{per_ns::PerNs, CrateDefMap}, | 19 | nameres::{per_ns::PerNs, CrateDefMap}, |
20 | path::{Path, PathKind}, | 20 | path::{Path, PathKind}, |
21 | AdtId, CrateModuleId, EnumVariantId, ModuleDefId, ModuleId, | 21 | AdtId, CrateModuleId, EnumVariantId, ModuleDefId, ModuleId, |
@@ -63,7 +63,7 @@ impl CrateDefMap { | |||
63 | // the result. | 63 | // the result. |
64 | pub(super) fn resolve_path_fp_with_macro( | 64 | pub(super) fn resolve_path_fp_with_macro( |
65 | &self, | 65 | &self, |
66 | db: &impl DefDatabase2, | 66 | db: &impl DefDatabase, |
67 | mode: ResolveMode, | 67 | mode: ResolveMode, |
68 | original_module: CrateModuleId, | 68 | original_module: CrateModuleId, |
69 | path: &Path, | 69 | path: &Path, |
@@ -216,7 +216,7 @@ impl CrateDefMap { | |||
216 | 216 | ||
217 | fn resolve_name_in_module( | 217 | fn resolve_name_in_module( |
218 | &self, | 218 | &self, |
219 | db: &impl DefDatabase2, | 219 | db: &impl DefDatabase, |
220 | module: CrateModuleId, | 220 | module: CrateModuleId, |
221 | name: &Name, | 221 | name: &Name, |
222 | ) -> PerNs { | 222 | ) -> PerNs { |
@@ -243,7 +243,7 @@ impl CrateDefMap { | |||
243 | from_crate_root.or(from_extern_prelude) | 243 | from_crate_root.or(from_extern_prelude) |
244 | } | 244 | } |
245 | 245 | ||
246 | fn resolve_in_prelude(&self, db: &impl DefDatabase2, name: &Name) -> PerNs { | 246 | fn resolve_in_prelude(&self, db: &impl DefDatabase, name: &Name) -> PerNs { |
247 | if let Some(prelude) = self.prelude { | 247 | if let Some(prelude) = self.prelude { |
248 | let keep; | 248 | let keep; |
249 | let def_map = if prelude.krate == self.krate { | 249 | let def_map = if prelude.krate == self.krate { |