diff options
Diffstat (limited to 'crates/hir_ty/src/display.rs')
-rw-r--r-- | crates/hir_ty/src/display.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs index 2022069d8..b7e85e024 100644 --- a/crates/hir_ty/src/display.rs +++ b/crates/hir_ty/src/display.rs | |||
@@ -12,8 +12,9 @@ use hir_expand::name::Name; | |||
12 | 12 | ||
13 | use crate::{ | 13 | use crate::{ |
14 | db::HirDatabase, from_assoc_type_id, from_foreign_def_id, primitive, to_assoc_type_id, | 14 | db::HirDatabase, from_assoc_type_id, from_foreign_def_id, primitive, to_assoc_type_id, |
15 | utils::generics, AdtId, AliasTy, CallableDefId, CallableSig, GenericPredicate, Interner, | 15 | traits::chalk::from_chalk, utils::generics, AdtId, AliasTy, CallableDefId, CallableSig, |
16 | Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs, TraitRef, Ty, TyKind, | 16 | GenericPredicate, Interner, Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, |
17 | Substs, TraitRef, Ty, TyKind, | ||
17 | }; | 18 | }; |
18 | 19 | ||
19 | pub struct HirFormatter<'a> { | 20 | pub struct HirFormatter<'a> { |
@@ -363,7 +364,7 @@ impl HirDisplay for Ty { | |||
363 | sig.hir_fmt(f)?; | 364 | sig.hir_fmt(f)?; |
364 | } | 365 | } |
365 | TyKind::FnDef(def, parameters) => { | 366 | TyKind::FnDef(def, parameters) => { |
366 | let def = *def; | 367 | let def = from_chalk(f.db, *def); |
367 | let sig = f.db.callable_item_signature(def).subst(parameters); | 368 | let sig = f.db.callable_item_signature(def).subst(parameters); |
368 | match def { | 369 | match def { |
369 | CallableDefId::FunctionId(ff) => { | 370 | CallableDefId::FunctionId(ff) => { |
@@ -431,7 +432,7 @@ impl HirDisplay for Ty { | |||
431 | || f.omit_verbose_types() | 432 | || f.omit_verbose_types() |
432 | { | 433 | { |
433 | match self | 434 | match self |
434 | .as_generic_def() | 435 | .as_generic_def(f.db) |
435 | .map(|generic_def_id| f.db.generic_defaults(generic_def_id)) | 436 | .map(|generic_def_id| f.db.generic_defaults(generic_def_id)) |
436 | .filter(|defaults| !defaults.is_empty()) | 437 | .filter(|defaults| !defaults.is_empty()) |
437 | { | 438 | { |