From 5af9e475f4acce54f8383ed22febc412cf2541d0 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 1 Jun 2019 21:17:57 +0300
Subject: add AstDatabase

---
 crates/ra_hir/src/nameres.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'crates/ra_hir/src/nameres.rs')

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;
 use once_cell::sync::Lazy;
 
 use crate::{
-    ModuleDef, Name, Crate, Module, MacroDef, AsName, BuiltinType,
+    ModuleDef, Name, Crate, Module, MacroDef, AsName, BuiltinType, AstDatabase,
     DefDatabase, Path, PathKind, HirFileId, Trait,
     ids::MacroDefId,
     diagnostics::DiagnosticSink,
@@ -232,7 +232,10 @@ fn or(left: ItemOrMacro, right: ItemOrMacro) -> ItemOrMacro {
 }
 
 impl CrateDefMap {
-    pub(crate) fn crate_def_map_query(db: &impl DefDatabase, krate: Crate) -> Arc<CrateDefMap> {
+    pub(crate) fn crate_def_map_query(
+        db: &(impl DefDatabase + AstDatabase),
+        krate: Crate,
+    ) -> Arc<CrateDefMap> {
         db.check_canceled();
         let _p = profile("crate_def_map_query");
         let def_map = {
@@ -278,7 +281,7 @@ impl CrateDefMap {
 
     pub(crate) fn add_diagnostics(
         &self,
-        db: &impl DefDatabase,
+        db: &(impl DefDatabase + AstDatabase),
         module: CrateModuleId,
         sink: &mut DiagnosticSink,
     ) {
@@ -534,7 +537,7 @@ mod diagnostics {
     use ra_syntax::{AstPtr, ast};
 
     use crate::{
-        AstId, DefDatabase,
+        AstId, DefDatabase, AstDatabase,
         nameres::CrateModuleId,
         diagnostics::{DiagnosticSink, UnresolvedModule}
 };
@@ -551,7 +554,7 @@ mod diagnostics {
     impl DefDiagnostic {
         pub(super) fn add_to(
             &self,
-            db: &impl DefDatabase,
+            db: &(impl DefDatabase + AstDatabase),
             target_module: CrateModuleId,
             sink: &mut DiagnosticSink,
         ) {
-- 
cgit v1.2.3