diff options
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 4573a72ba..f8627acbe 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -24,9 +24,8 @@ use rustc_hash::{FxHashMap, FxHashSet}; | |||
24 | 24 | ||
25 | use crate::{ | 25 | use crate::{ |
26 | Module, ModuleDef, | 26 | Module, ModuleDef, |
27 | Path, PathKind, | 27 | Path, PathKind, Crate, |
28 | HirDatabase, Crate, | 28 | Name, PersistentHirDatabase, |
29 | Name, | ||
30 | module_tree::{ModuleId, ModuleTree}, | 29 | module_tree::{ModuleId, ModuleTree}, |
31 | nameres::lower::{ImportId, LoweredModule, ImportData}, | 30 | nameres::lower::{ImportId, LoweredModule, ImportData}, |
32 | }; | 31 | }; |
@@ -166,7 +165,7 @@ struct Resolver<'a, DB> { | |||
166 | 165 | ||
167 | impl<'a, DB> Resolver<'a, DB> | 166 | impl<'a, DB> Resolver<'a, DB> |
168 | where | 167 | where |
169 | DB: HirDatabase, | 168 | DB: PersistentHirDatabase, |
170 | { | 169 | { |
171 | fn new( | 170 | fn new( |
172 | db: &'a DB, | 171 | db: &'a DB, |
@@ -330,7 +329,7 @@ enum ReachedFixedPoint { | |||
330 | } | 329 | } |
331 | 330 | ||
332 | impl ItemMap { | 331 | impl ItemMap { |
333 | pub(crate) fn item_map_query(db: &impl HirDatabase, krate: Crate) -> Arc<ItemMap> { | 332 | pub(crate) fn item_map_query(db: &impl PersistentHirDatabase, krate: Crate) -> Arc<ItemMap> { |
334 | let start = time::Instant::now(); | 333 | let start = time::Instant::now(); |
335 | let module_tree = db.module_tree(krate); | 334 | let module_tree = db.module_tree(krate); |
336 | let input = module_tree | 335 | let input = module_tree |
@@ -352,7 +351,7 @@ impl ItemMap { | |||
352 | 351 | ||
353 | pub(crate) fn resolve_path( | 352 | pub(crate) fn resolve_path( |
354 | &self, | 353 | &self, |
355 | db: &impl HirDatabase, | 354 | db: &impl PersistentHirDatabase, |
356 | original_module: Module, | 355 | original_module: Module, |
357 | path: &Path, | 356 | path: &Path, |
358 | ) -> PerNs<ModuleDef> { | 357 | ) -> PerNs<ModuleDef> { |
@@ -363,7 +362,7 @@ impl ItemMap { | |||
363 | // the result. | 362 | // the result. |
364 | fn resolve_path_fp( | 363 | fn resolve_path_fp( |
365 | &self, | 364 | &self, |
366 | db: &impl HirDatabase, | 365 | db: &impl PersistentHirDatabase, |
367 | original_module: Module, | 366 | original_module: Module, |
368 | path: &Path, | 367 | path: &Path, |
369 | ) -> (PerNs<ModuleDef>, ReachedFixedPoint) { | 368 | ) -> (PerNs<ModuleDef>, ReachedFixedPoint) { |