diff options
author | Aleksey Kladov <[email protected]> | 2019-11-23 11:44:43 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-23 11:49:45 +0000 |
commit | fc1e543f7abb69b8cab308410fa0a127950ee1c5 (patch) | |
tree | 5e30f4e18a0ea83215fd48776f372546dece9431 /crates/ra_hir/src/db.rs | |
parent | 958862093e83083b188427246323047a2c9e7bab (diff) |
Get rid of DefDatabase2
Diffstat (limited to 'crates/ra_hir/src/db.rs')
-rw-r--r-- | crates/ra_hir/src/db.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 2dca0f637..399101b83 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
@@ -17,7 +17,7 @@ use crate::{ | |||
17 | 17 | ||
18 | pub use hir_def::db::{ | 18 | pub use hir_def::db::{ |
19 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, | 19 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, |
20 | DefDatabase2, DefDatabase2Storage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, | 20 | DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, |
21 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, | 21 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, |
22 | LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery, | 22 | LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery, |
23 | StaticDataQuery, StructDataQuery, TraitDataQuery, TypeAliasDataQuery, | 23 | StaticDataQuery, StructDataQuery, TraitDataQuery, TypeAliasDataQuery, |
@@ -27,8 +27,6 @@ pub use hir_expand::db::{ | |||
27 | ParseMacroQuery, | 27 | ParseMacroQuery, |
28 | }; | 28 | }; |
29 | 29 | ||
30 | pub use DefDatabase2 as DefDatabase; | ||
31 | |||
32 | #[salsa::query_group(HirDatabaseStorage)] | 30 | #[salsa::query_group(HirDatabaseStorage)] |
33 | #[salsa::requires(salsa::Database)] | 31 | #[salsa::requires(salsa::Database)] |
34 | pub trait HirDatabase: DefDatabase + AstDatabase { | 32 | pub trait HirDatabase: DefDatabase + AstDatabase { |