diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-26 19:56:35 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-26 19:56:35 +0000 |
commit | 7d088a16df5983b9dcf392c7361f19e099e713bf (patch) | |
tree | 94929e320d14ae8829f807ff83824fb94f44c375 /crates/ra_hir/src/db.rs | |
parent | d770f22c53a88035e2836cc01533dab4223f80d5 (diff) | |
parent | bed6869865ccfc6e72be26cb2041d83ab5cdbe3c (diff) |
Merge #2421
2421: Cleanup r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 3b5aa7516..31b21ca84 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
4 | 4 | ||
5 | use hir_def::{GenericDefId, LocalStructFieldId, TraitId, VariantId}; | ||
5 | use ra_arena::map::ArenaMap; | 6 | use ra_arena::map::ArenaMap; |
6 | use ra_db::{salsa, CrateId}; | 7 | use ra_db::{salsa, CrateId}; |
7 | 8 | ||
@@ -12,19 +13,15 @@ use crate::{ | |||
12 | CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, Ty, TyDefId, TypeCtor, | 13 | CallableDef, FnSig, GenericPredicate, InferenceResult, Substs, Ty, TyDefId, TypeCtor, |
13 | ValueTyDefId, | 14 | ValueTyDefId, |
14 | }, | 15 | }, |
15 | Crate, DefWithBody, ImplBlock, Trait, | 16 | Crate, DefWithBody, ImplBlock, |
16 | }; | 17 | }; |
17 | 18 | ||
18 | pub use hir_def::{ | 19 | pub use hir_def::db::{ |
19 | db::{ | 20 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, |
20 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, | 21 | DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, |
21 | DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, | 22 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, |
22 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, | 23 | LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery, |
23 | InternDatabaseStorage, LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, | 24 | StaticDataQuery, StructDataQuery, TraitDataQuery, TypeAliasDataQuery, |
24 | RawItemsWithSourceMapQuery, StaticDataQuery, StructDataQuery, TraitDataQuery, | ||
25 | TypeAliasDataQuery, | ||
26 | }, | ||
27 | GenericDefId, LocalStructFieldId, VariantId, | ||
28 | }; | 25 | }; |
29 | pub use hir_expand::db::{ | 26 | pub use hir_expand::db::{ |
30 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 27 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |
@@ -66,7 +63,7 @@ pub trait HirDatabase: DefDatabase { | |||
66 | fn impls_in_crate(&self, krate: CrateId) -> Arc<CrateImplBlocks>; | 63 | fn impls_in_crate(&self, krate: CrateId) -> Arc<CrateImplBlocks>; |
67 | 64 | ||
68 | #[salsa::invoke(crate::ty::traits::impls_for_trait_query)] | 65 | #[salsa::invoke(crate::ty::traits::impls_for_trait_query)] |
69 | fn impls_for_trait(&self, krate: Crate, trait_: Trait) -> Arc<[ImplBlock]>; | 66 | fn impls_for_trait(&self, krate: CrateId, trait_: TraitId) -> Arc<[ImplBlock]>; |
70 | 67 | ||
71 | /// This provides the Chalk trait solver instance. Because Chalk always | 68 | /// This provides the Chalk trait solver instance. Because Chalk always |
72 | /// works from a specific crate, this query is keyed on the crate; and | 69 | /// works from a specific crate, this query is keyed on the crate; and |