diff options
| author | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
| commit | b21d9337d9200e2cfdc90b386591c72c302dc03e (patch) | |
| tree | f81f5c08f821115cee26fa4d3ceaae88c7807fd5 /crates/ra_hir/src/db.rs | |
| parent | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (diff) | |
| parent | ce07a2daa9e53aa86a769f8641b14c2878444fbc (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/db.rs')
| -rw-r--r-- | crates/ra_hir/src/db.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index bfae3660b..f5ffd64fa 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs | |||
| @@ -4,8 +4,8 @@ pub use hir_def::db::{ | |||
| 4 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, | 4 | BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery, |
| 5 | DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, | 5 | DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery, |
| 6 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, | 6 | FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage, |
| 7 | LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery, | 7 | LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, StaticDataQuery, StructDataQuery, |
| 8 | StaticDataQuery, StructDataQuery, TraitDataQuery, TypeAliasDataQuery, | 8 | TraitDataQuery, TypeAliasDataQuery, |
| 9 | }; | 9 | }; |
| 10 | pub use hir_expand::db::{ | 10 | pub use hir_expand::db::{ |
| 11 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, | 11 | AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, |