From 7a7e47eab7323a8e122d9994b2936e50e42a1af2 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Thu, 18 Mar 2021 21:53:19 +0100 Subject: Chalkify TraitRef --- crates/hir/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/hir/src/lib.rs') diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 95cfde61c..67ec8e82a 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -1462,7 +1462,7 @@ impl TypeParam { .into_iter() .filter_map(|pred| match &pred.value { hir_ty::GenericPredicate::Implemented(trait_ref) => { - Some(Trait::from(trait_ref.trait_)) + Some(Trait::from(trait_ref.hir_trait_id())) } _ => None, }) @@ -1757,8 +1757,8 @@ impl Type { pub fn impls_trait(&self, db: &dyn HirDatabase, trait_: Trait, args: &[Type]) -> bool { let trait_ref = hir_ty::TraitRef { - trait_: trait_.id, - substs: Substitution::build_for_def(db, trait_.id) + trait_id: hir_ty::to_chalk_trait_id(trait_.id), + substitution: Substitution::build_for_def(db, trait_.id) .push(self.ty.value.clone()) .fill(args.iter().map(|t| t.ty.value.clone())) .build(), @@ -2023,7 +2023,7 @@ impl Type { it.into_iter() .filter_map(|pred| match pred { hir_ty::GenericPredicate::Implemented(trait_ref) => { - Some(Trait::from(trait_ref.trait_)) + Some(Trait::from(trait_ref.hir_trait_id())) } _ => None, }) @@ -2067,7 +2067,7 @@ impl Type { match pred { GenericPredicate::Implemented(trait_ref) => { cb(type_.clone()); - walk_substs(db, type_, &trait_ref.substs, cb); + walk_substs(db, type_, &trait_ref.substitution, cb); } _ => (), } -- cgit v1.2.3