diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-23 11:50:30 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-23 11:50:30 +0000 |
commit | 102f1984c662544d16441d437e5b0883502d49d1 (patch) | |
tree | 9fbf1b22c02412f15ad4ddb8fcbc405ce8d33795 /crates/ra_hir/src/db.rs | |
parent | ee300085c016a5b24ff61e0a1406857d4e638618 (diff) | |
parent | 32658a73b4c9078421a1cab92ec459bb5b7236f5 (diff) |
Merge #2372
2372: Note that debugging infra is broken 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 | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index cae305f98..399101b83 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -5,7 +5,6 @@ use std::sync::Arc; | |||
5 | use ra_db::salsa; | 5 | use ra_db::salsa; |
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
8 | debug::HirDebugDatabase, | ||
9 | ids, | 8 | ids, |
10 | ty::{ | 9 | ty::{ |
11 | method_resolution::CrateImplBlocks, | 10 | method_resolution::CrateImplBlocks, |
@@ -18,24 +17,16 @@ use crate::{ | |||
18 | 17 | ||
19 | pub use hir_def::db::{ | 18 | pub use hir_def::db::{ |
20 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, | 19 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, |
21 | DefDatabase2, DefDatabase2Storage, EnumDataQuery, ExprScopesQuery, FunctionDataQuery, | 20 | DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, |
22 | GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, LangItemQuery, | 21 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, |
23 | ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery, StaticDataQuery, | 22 | LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery, |
24 | StructDataQuery, TraitDataQuery, TypeAliasDataQuery, | 23 | StaticDataQuery, StructDataQuery, TraitDataQuery, TypeAliasDataQuery, |
25 | }; | 24 | }; |
26 | pub use hir_expand::db::{ | 25 | pub use hir_expand::db::{ |
27 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 26 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |
28 | ParseMacroQuery, | 27 | ParseMacroQuery, |
29 | }; | 28 | }; |
30 | 29 | ||
31 | // This database uses `AstDatabase` internally, | ||
32 | #[salsa::query_group(DefDatabaseStorage)] | ||
33 | #[salsa::requires(AstDatabase)] | ||
34 | pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { | ||
35 | #[salsa::invoke(crate::code_model::docs::documentation_query)] | ||
36 | fn documentation(&self, def: crate::DocDef) -> Option<crate::Documentation>; | ||
37 | } | ||
38 | |||
39 | #[salsa::query_group(HirDatabaseStorage)] | 30 | #[salsa::query_group(HirDatabaseStorage)] |
40 | #[salsa::requires(salsa::Database)] | 31 | #[salsa::requires(salsa::Database)] |
41 | pub trait HirDatabase: DefDatabase + AstDatabase { | 32 | pub trait HirDatabase: DefDatabase + AstDatabase { |