diff options
Diffstat (limited to 'crates/hir_ty/src/traits/chalk')
-rw-r--r-- | crates/hir_ty/src/traits/chalk/interner.rs | 1 | ||||
-rw-r--r-- | crates/hir_ty/src/traits/chalk/mapping.rs | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crates/hir_ty/src/traits/chalk/interner.rs b/crates/hir_ty/src/traits/chalk/interner.rs index e891efb7b..1dc3f497d 100644 --- a/crates/hir_ty/src/traits/chalk/interner.rs +++ b/crates/hir_ty/src/traits/chalk/interner.rs | |||
@@ -20,7 +20,6 @@ pub(crate) type ImplId = chalk_ir::ImplId<Interner>; | |||
20 | pub(crate) type ImplDatum = chalk_solve::rust_ir::ImplDatum<Interner>; | 20 | pub(crate) type ImplDatum = chalk_solve::rust_ir::ImplDatum<Interner>; |
21 | pub(crate) type AssociatedTyValueId = chalk_solve::rust_ir::AssociatedTyValueId<Interner>; | 21 | pub(crate) type AssociatedTyValueId = chalk_solve::rust_ir::AssociatedTyValueId<Interner>; |
22 | pub(crate) type AssociatedTyValue = chalk_solve::rust_ir::AssociatedTyValue<Interner>; | 22 | pub(crate) type AssociatedTyValue = chalk_solve::rust_ir::AssociatedTyValue<Interner>; |
23 | pub(crate) type FnDefId = chalk_ir::FnDefId<Interner>; | ||
24 | pub(crate) type FnDefDatum = chalk_solve::rust_ir::FnDefDatum<Interner>; | 23 | pub(crate) type FnDefDatum = chalk_solve::rust_ir::FnDefDatum<Interner>; |
25 | pub(crate) type OpaqueTyId = chalk_ir::OpaqueTyId<Interner>; | 24 | pub(crate) type OpaqueTyId = chalk_ir::OpaqueTyId<Interner>; |
26 | pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>; | 25 | pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>; |
diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs index 67ac95a0e..23ef07d77 100644 --- a/crates/hir_ty/src/traits/chalk/mapping.rs +++ b/crates/hir_ty/src/traits/chalk/mapping.rs | |||
@@ -66,8 +66,7 @@ impl ToChalk for Ty { | |||
66 | chalk_ir::TyKind::Slice(substs[0].clone().to_chalk(db)).intern(&Interner) | 66 | chalk_ir::TyKind::Slice(substs[0].clone().to_chalk(db)).intern(&Interner) |
67 | } | 67 | } |
68 | TyKind::Str => chalk_ir::TyKind::Str.intern(&Interner), | 68 | TyKind::Str => chalk_ir::TyKind::Str.intern(&Interner), |
69 | TyKind::FnDef(callable_def, substs) => { | 69 | TyKind::FnDef(id, substs) => { |
70 | let id = callable_def.to_chalk(db); | ||
71 | let substitution = substs.to_chalk(db); | 70 | let substitution = substs.to_chalk(db); |
72 | chalk_ir::TyKind::FnDef(id, substitution).intern(&Interner) | 71 | chalk_ir::TyKind::FnDef(id, substitution).intern(&Interner) |
73 | } | 72 | } |
@@ -201,7 +200,7 @@ impl ToChalk for Ty { | |||
201 | chalk_ir::TyKind::Never => TyKind::Never, | 200 | chalk_ir::TyKind::Never => TyKind::Never, |
202 | 201 | ||
203 | chalk_ir::TyKind::FnDef(fn_def_id, subst) => { | 202 | chalk_ir::TyKind::FnDef(fn_def_id, subst) => { |
204 | TyKind::FnDef(from_chalk(db, fn_def_id), from_chalk(db, subst)) | 203 | TyKind::FnDef(fn_def_id, from_chalk(db, subst)) |
205 | } | 204 | } |
206 | 205 | ||
207 | chalk_ir::TyKind::Closure(id, subst) => { | 206 | chalk_ir::TyKind::Closure(id, subst) => { |