1 files changed, 11 insertions, 7 deletions

diff --git a/crates/ra_analysis/src/hir/db.rs b/crates/ra_analysis/src/hir/db.rs
index 0998295f5..bf0dc393a 100644
--- a/crates/ra_analysis/src/hir/db.rs
+++ b/crates/ra_analysis/src/hir/db.rs
@@ -8,20 +8,24 @@ use ra_syntax::{
 use crate::{
     FileId,
     db::SyntaxDatabase,
-    hir::{SourceFileItems, SourceItemId},
-    hir::query_definitions,
-    hir::function::{FnId, FnScopes},
-    hir::module::{
-        ModuleId, ModuleTree, ModuleSource,
-        nameres::{ItemMap, InputModuleItems}
+    hir::{
+        SourceFileItems, SourceItemId,
+        query_definitions,
+        function::{FnScopes},
+        module::{ModuleId, ModuleTree, ModuleSource,
+        nameres::{ItemMap, InputModuleItems}},
     },
     input::SourceRootId,
+    loc2id::{DefLoc, DefId, FnId, LocationIntener},
     Cancelable,
 };
 
 salsa::query_group! {
 
-pub(crate) trait HirDatabase: SyntaxDatabase {
+pub(crate) trait HirDatabase: SyntaxDatabase
+    + AsRef<LocationIntener<DefLoc, DefId>>
+    + AsRef<LocationIntener<SourceItemId, FnId>>
+{
     fn fn_scopes(fn_id: FnId) -> Arc<FnScopes> {
         type FnScopesQuery;
         use fn query_definitions::fn_scopes;