diff options
author | Aleksey Kladov <[email protected]> | 2018-12-27 20:51:44 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-12-27 20:51:44 +0000 |
commit | dddbac68779d068cabfa511bed4ba105bc43d194 (patch) | |
tree | 151debc868ea523fd02bb7088faea7b6e2d7bfed /crates/ra_hir/src/db.rs | |
parent | efb63a7666cc9532d97fa7e0da14b540ae8bd5df (diff) |
remove FnId
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index e7f9afa77..ba43a4502 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -3,7 +3,6 @@ use std::sync::Arc; | |||
3 | use ra_syntax::{ | 3 | use ra_syntax::{ |
4 | SmolStr, | 4 | SmolStr, |
5 | SyntaxNode, | 5 | SyntaxNode, |
6 | ast::FnDefNode, | ||
7 | }; | 6 | }; |
8 | use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, FileId, Cancelable}; | 7 | use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, FileId, Cancelable}; |
9 | 8 | ||
@@ -12,7 +11,6 @@ use crate::{ | |||
12 | SourceFileItems, SourceItemId, | 11 | SourceFileItems, SourceItemId, |
13 | query_definitions, | 12 | query_definitions, |
14 | FnScopes, | 13 | FnScopes, |
15 | function::FnId, | ||
16 | module::{ModuleId, ModuleTree, ModuleSource, | 14 | module::{ModuleId, ModuleTree, ModuleSource, |
17 | nameres::{ItemMap, InputModuleItems}}, | 15 | nameres::{ItemMap, InputModuleItems}}, |
18 | ty::{InferenceResult, Ty}, | 16 | ty::{InferenceResult, Ty}, |
@@ -24,14 +22,10 @@ salsa::query_group! { | |||
24 | pub trait HirDatabase: SyntaxDatabase | 22 | pub trait HirDatabase: SyntaxDatabase |
25 | + AsRef<LocationIntener<DefLoc, DefId>> | 23 | + AsRef<LocationIntener<DefLoc, DefId>> |
26 | { | 24 | { |
27 | fn fn_scopes(fn_id: FnId) -> Arc<FnScopes> { | 25 | fn fn_scopes(def_id: DefId) -> Arc<FnScopes> { |
28 | type FnScopesQuery; | 26 | type FnScopesQuery; |
29 | use fn query_definitions::fn_scopes; | 27 | use fn query_definitions::fn_scopes; |
30 | } | 28 | } |
31 | fn fn_syntax(fn_id: FnId) -> FnDefNode { | ||
32 | type FnSyntaxQuery; | ||
33 | use fn query_definitions::fn_syntax; | ||
34 | } | ||
35 | 29 | ||
36 | fn struct_data(def_id: DefId) -> Cancelable<Arc<StructData>> { | 30 | fn struct_data(def_id: DefId) -> Cancelable<Arc<StructData>> { |
37 | type StructDataQuery; | 31 | type StructDataQuery; |
@@ -43,7 +37,7 @@ pub trait HirDatabase: SyntaxDatabase | |||
43 | use fn query_definitions::enum_data; | 37 | use fn query_definitions::enum_data; |
44 | } | 38 | } |
45 | 39 | ||
46 | fn infer(fn_id: FnId) -> Cancelable<Arc<InferenceResult>> { | 40 | fn infer(def_id: DefId) -> Cancelable<Arc<InferenceResult>> { |
47 | type InferQuery; | 41 | type InferQuery; |
48 | use fn query_definitions::infer; | 42 | use fn query_definitions::infer; |
49 | } | 43 | } |