From c1ed9ccc4ed7dfff3abb6eb01d7c311c8e31108c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 30 Oct 2019 17:40:13 +0300 Subject: fix compilation --- crates/ra_hir/src/db.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'crates/ra_hir/src/db.rs') diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs index 142d7338d..ebfd970eb 100644 --- a/crates/ra_hir/src/db.rs +++ b/crates/ra_hir/src/db.rs @@ -23,7 +23,10 @@ use crate::{ Struct, StructField, Trait, TypeAlias, }; -pub use hir_def::db::{InternDatabase, InternDatabaseStorage}; +pub use hir_def::db::{ + DefDatabase2, DefDatabase2Storage, InternDatabase, InternDatabaseStorage, RawItemsQuery, + RawItemsWithSourceMapQuery, +}; pub use hir_expand::db::{ AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, ParseMacroQuery, @@ -32,7 +35,7 @@ pub use hir_expand::db::{ // This database uses `AstDatabase` internally, #[salsa::query_group(DefDatabaseStorage)] #[salsa::requires(AstDatabase)] -pub trait DefDatabase: HirDebugDatabase + hir_def::db::DefDatabase2 { +pub trait DefDatabase: HirDebugDatabase + DefDatabase2 { #[salsa::invoke(crate::adt::StructData::struct_data_query)] fn struct_data(&self, s: Struct) -> Arc; -- cgit v1.2.3