From 9fe09db771aa3890ac8a0eeb1d9e6097060fad06 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 24 Jan 2019 12:41:08 +0300
Subject: encapsulate hir locations

---
 crates/ra_hir/src/db.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index f383701d7..cc03da1e2 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
 use ra_syntax::{SyntaxNode, TreeArc, SourceFile};
-use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, salsa};
+use ra_db::{SourceRootId, SyntaxDatabase, salsa};
 
 use crate::{
-    DefLoc, DefId, MacroCallLoc, MacroCallId, Name, HirFileId,
+    HirInterner, DefId, MacroCallId, Name, HirFileId,
     SourceFileItems, SourceItemId, Crate,
     query_definitions,
     FnSignature, FnScopes,
@@ -18,11 +18,7 @@ use crate::{
 };
 
 #[salsa::query_group]
-pub trait HirDatabase:
-    SyntaxDatabase
-    + AsRef<LocationIntener<DefLoc, DefId>>
-    + AsRef<LocationIntener<MacroCallLoc, MacroCallId>>
-{
+pub trait HirDatabase: SyntaxDatabase + AsRef<HirInterner> {
     #[salsa::invoke(HirFileId::hir_source_file)]
     fn hir_source_file(&self, file_id: HirFileId) -> TreeArc<SourceFile>;
 
-- 
cgit v1.2.3