1 files changed, 8 insertions, 17 deletions

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index e7f9afa77..5a8ca3b47 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -1,18 +1,13 @@
 use std::sync::Arc;
 
-use ra_syntax::{
-    SmolStr,
-    SyntaxNode,
-    ast::FnDefNode,
-};
+use ra_syntax::SyntaxNode;
 use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, FileId, Cancelable};
 
 use crate::{
-    DefLoc, DefId,
+    DefLoc, DefId, Name,
     SourceFileItems, SourceItemId,
     query_definitions,
     FnScopes,
-    function::FnId,
     module::{ModuleId, ModuleTree, ModuleSource,
     nameres::{ItemMap, InputModuleItems}},
     ty::{InferenceResult, Ty},
@@ -24,14 +19,10 @@ salsa::query_group! {
 pub trait HirDatabase: SyntaxDatabase
     + AsRef<LocationIntener<DefLoc, DefId>>
 {
-    fn fn_scopes(fn_id: FnId) -> Arc<FnScopes> {
+    fn fn_scopes(def_id: DefId) -> Arc<FnScopes> {
         type FnScopesQuery;
         use fn query_definitions::fn_scopes;
     }
-    fn fn_syntax(fn_id: FnId) -> FnDefNode {
-        type FnSyntaxQuery;
-        use fn query_definitions::fn_syntax;
-    }
 
     fn struct_data(def_id: DefId) -> Cancelable<Arc<StructData>> {
         type StructDataQuery;
@@ -43,19 +34,19 @@ pub trait HirDatabase: SyntaxDatabase
         use fn query_definitions::enum_data;
     }
 
-    fn infer(fn_id: FnId) -> Cancelable<Arc<InferenceResult>> {
+    fn infer(def_id: DefId) -> Cancelable<Arc<InferenceResult>> {
         type InferQuery;
-        use fn query_definitions::infer;
+        use fn crate::ty::infer;
     }
 
     fn type_for_def(def_id: DefId) -> Cancelable<Ty> {
         type TypeForDefQuery;
-        use fn query_definitions::type_for_def;
+        use fn crate::ty::type_for_def;
     }
 
-    fn type_for_field(def_id: DefId, field: SmolStr) -> Cancelable<Ty> {
+    fn type_for_field(def_id: DefId, field: Name) -> Cancelable<Ty> {
         type TypeForFieldQuery;
-        use fn query_definitions::type_for_field;
+        use fn crate::ty::type_for_field;
     }
 
     fn file_items(file_id: FileId) -> Arc<SourceFileItems> {