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

Use chalk_ir::FnDefId

Browse source
This commit is contained in:
Florian Diebold 2021-03-13 17:55:50 +01:00
parent 19664e276a
commit 9719ce9fc7
10 changed files with 48 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/hir_ty/src/display.rs
View file

@ -12,8 +12,9 @@ use hir_expand::name::Name;
use crate::{
db::HirDatabase, from_assoc_type_id, from_foreign_def_id, primitive, to_assoc_type_id,
utils::generics, AdtId, AliasTy, CallableDefId, CallableSig, GenericPredicate, Interner,
Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs, TraitRef, Ty, TyKind,
traits::chalk::from_chalk, utils::generics, AdtId, AliasTy, CallableDefId, CallableSig,
GenericPredicate, Interner, Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar,
Substs, TraitRef, Ty, TyKind,
};
pub struct HirFormatter<'a> {
@ -363,7 +364,7 @@ impl HirDisplay for Ty {
sig.hir_fmt(f)?;
}
TyKind::FnDef(def, parameters) => {
let def = *def;
let def = from_chalk(f.db, *def);
let sig = f.db.callable_item_signature(def).subst(parameters);
match def {
CallableDefId::FunctionId(ff) => {
@ -431,7 +432,7 @@ impl HirDisplay for Ty {
|| f.omit_verbose_types()
{
match self
.as_generic_def()
.as_generic_def(f.db)
.map(|generic_def_id| f.db.generic_defaults(generic_def_id))
.filter(|defaults| !defaults.is_empty())
{