language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Get rid of DefDatabase2

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-23 14:44:43 +03:00
parent 958862093e
commit fc1e543f7a
23 changed files with 123 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ use crate::{
pub use hir_def::db::{
BodyQuery, BodyWithSourceMapQuery, ConstDataQuery, CrateDefMapQuery, CrateLangItemsQuery,
DefDatabase2, DefDatabase2Storage, DocumentationQuery, EnumDataQuery, ExprScopesQuery,
DefDatabase, DefDatabaseStorage, DocumentationQuery, EnumDataQuery, ExprScopesQuery,
FunctionDataQuery, GenericParamsQuery, ImplDataQuery, InternDatabase, InternDatabaseStorage,
LangItemQuery, ModuleLangItemsQuery, RawItemsQuery, RawItemsWithSourceMapQuery,
StaticDataQuery, StructDataQuery, TraitDataQuery, TypeAliasDataQuery,
@ -27,8 +27,6 @@ pub use hir_expand::db::{
ParseMacroQuery,
};
pub use DefDatabase2 as DefDatabase;
#[salsa::query_group(HirDatabaseStorage)]
#[salsa::requires(salsa::Database)]
pub trait HirDatabase: DefDatabase + AstDatabase {

4
crates/ra_hir/src/test_db.rs
View file

@ -2,7 +2,7 @@
use std::{panic, sync::Arc};
use hir_def::{db::DefDatabase2, ModuleId};
use hir_def::{db::DefDatabase, ModuleId};
use hir_expand::diagnostics::DiagnosticSink;
use parking_lot::Mutex;
use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath, SourceDatabase};
@ -14,7 +14,7 @@ use crate::{db, debug::HirDebugHelper};
ra_db::SourceDatabaseStorage,
db::InternDatabaseStorage,
db::AstDatabaseStorage,
db::DefDatabase2Storage,
db::DefDatabaseStorage,
db::HirDatabaseStorage
)]
#[derive(Debug, Default)]