Use GenericDefIdMore

This commit is contained in:
Aleksey Kladov 2019-11-25 15:41:53 +03:00
parent c2a16632d0
commit 5f39c5794e
10 changed files with 44 additions and 56 deletions

View file

@ -12,7 +12,7 @@ use crate::{
CallableDef, FnSig, GenericPredicate, InferenceResult, Namespace, Substs, Ty, TypableDef,
TypeCtor,
},
Crate, DefWithBody, GenericDef, ImplBlock, Trait,
Crate, DefWithBody, ImplBlock, Trait,
};
pub use hir_def::{
@ -49,7 +49,7 @@ pub trait HirDatabase: DefDatabase {
#[salsa::invoke(crate::ty::generic_predicates_for_param_query)]
fn generic_predicates_for_param(
&self,
def: GenericDef,
def: GenericDefId,
param_idx: u32,
) -> Arc<[GenericPredicate]>;
@ -57,7 +57,7 @@ pub trait HirDatabase: DefDatabase {
fn generic_predicates(&self, def: GenericDefId) -> Arc<[GenericPredicate]>;
#[salsa::invoke(crate::ty::generic_defaults_query)]
fn generic_defaults(&self, def: GenericDef) -> Substs;
fn generic_defaults(&self, def: GenericDefId) -> Substs;
#[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)]
fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>;