language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix compilation

Browse source
This commit is contained in:
Aleksey Kladov 2019-10-30 17:40:13 +03:00
parent e5300ad3ba
commit c1ed9ccc4e
7 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_hir/src/db.rs
View file

@ -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<StructData>;