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

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

8
crates/ra_hir_def/src/generics.rs
View file

@ -8,7 +8,7 @@ use hir_expand::name::{self, AsName, Name};
use ra_syntax::ast::{self, NameOwner, TypeBoundsOwner, TypeParamsOwner};
use crate::{
db::DefDatabase2,
db::DefDatabase,
type_ref::{TypeBound, TypeRef},
AdtId, AstItemDef, ContainerId, GenericDefId, HasSource, Lookup,
};
@ -42,7 +42,7 @@ pub struct WherePredicate {
impl GenericParams {
pub(crate) fn generic_params_query(
db: &impl DefDatabase2,
db: &impl DefDatabase,
def: GenericDefId,
) -> Arc<GenericParams> {
let parent_generics = parent_generic_def(db, def).map(|it| db.generic_params(it));
@ -50,7 +50,7 @@ impl GenericParams {
}
fn new(
db: &impl DefDatabase2,
db: &impl DefDatabase,
def: GenericDefId,
parent_params: Option<Arc<GenericParams>>,
) -> GenericParams {
@ -168,7 +168,7 @@ impl GenericParams {
}
}
fn parent_generic_def(db: &impl DefDatabase2, def: GenericDefId) -> Option<GenericDefId> {
fn parent_generic_def(db: &impl DefDatabase, def: GenericDefId) -> Option<GenericDefId> {
let container = match def {
GenericDefId::FunctionId(it) => it.lookup(db).container,
GenericDefId::TypeAliasId(it) => it.lookup(db).container,