diff options
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 6b1160aa7..d649aa820 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -65,7 +65,7 @@ use ra_prof::profile; | |||
65 | use once_cell::sync::Lazy; | 65 | use once_cell::sync::Lazy; |
66 | 66 | ||
67 | use crate::{ | 67 | use crate::{ |
68 | ModuleDef, Name, Crate, Module, MacroDef, AsName, BuiltinType, | 68 | ModuleDef, Name, Crate, Module, MacroDef, AsName, BuiltinType, AstDatabase, |
69 | DefDatabase, Path, PathKind, HirFileId, Trait, | 69 | DefDatabase, Path, PathKind, HirFileId, Trait, |
70 | ids::MacroDefId, | 70 | ids::MacroDefId, |
71 | diagnostics::DiagnosticSink, | 71 | diagnostics::DiagnosticSink, |
@@ -232,7 +232,10 @@ fn or(left: ItemOrMacro, right: ItemOrMacro) -> ItemOrMacro { | |||
232 | } | 232 | } |
233 | 233 | ||
234 | impl CrateDefMap { | 234 | impl CrateDefMap { |
235 | pub(crate) fn crate_def_map_query(db: &impl DefDatabase, krate: Crate) -> Arc<CrateDefMap> { | 235 | pub(crate) fn crate_def_map_query( |
236 | db: &(impl DefDatabase + AstDatabase), | ||
237 | krate: Crate, | ||
238 | ) -> Arc<CrateDefMap> { | ||
236 | db.check_canceled(); | 239 | db.check_canceled(); |
237 | let _p = profile("crate_def_map_query"); | 240 | let _p = profile("crate_def_map_query"); |
238 | let def_map = { | 241 | let def_map = { |
@@ -278,7 +281,7 @@ impl CrateDefMap { | |||
278 | 281 | ||
279 | pub(crate) fn add_diagnostics( | 282 | pub(crate) fn add_diagnostics( |
280 | &self, | 283 | &self, |
281 | db: &impl DefDatabase, | 284 | db: &(impl DefDatabase + AstDatabase), |
282 | module: CrateModuleId, | 285 | module: CrateModuleId, |
283 | sink: &mut DiagnosticSink, | 286 | sink: &mut DiagnosticSink, |
284 | ) { | 287 | ) { |
@@ -534,7 +537,7 @@ mod diagnostics { | |||
534 | use ra_syntax::{AstPtr, ast}; | 537 | use ra_syntax::{AstPtr, ast}; |
535 | 538 | ||
536 | use crate::{ | 539 | use crate::{ |
537 | AstId, DefDatabase, | 540 | AstId, DefDatabase, AstDatabase, |
538 | nameres::CrateModuleId, | 541 | nameres::CrateModuleId, |
539 | diagnostics::{DiagnosticSink, UnresolvedModule} | 542 | diagnostics::{DiagnosticSink, UnresolvedModule} |
540 | }; | 543 | }; |
@@ -551,7 +554,7 @@ mod diagnostics { | |||
551 | impl DefDiagnostic { | 554 | impl DefDiagnostic { |
552 | pub(super) fn add_to( | 555 | pub(super) fn add_to( |
553 | &self, | 556 | &self, |
554 | db: &impl DefDatabase, | 557 | db: &(impl DefDatabase + AstDatabase), |
555 | target_module: CrateModuleId, | 558 | target_module: CrateModuleId, |
556 | sink: &mut DiagnosticSink, | 559 | sink: &mut DiagnosticSink, |
557 | ) { | 560 | ) { |