From 77333a571ffb401a6765bbc80dea082ad08238d9 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Sat, 3 Apr 2021 21:59:13 +0200 Subject: More TyBuilder use --- crates/hir_ty/src/infer/coerce.rs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'crates') diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs index 744f30a93..ed8c677a8 100644 --- a/crates/hir_ty/src/infer/coerce.rs +++ b/crates/hir_ty/src/infer/coerce.rs @@ -8,7 +8,7 @@ use chalk_ir::{cast::Cast, Mutability, TyVariableKind}; use hir_def::lang_item::LangItemTarget; use crate::{ - autoderef, to_chalk_trait_id, traits::Solution, Interner, Substitution, TraitRef, Ty, + autoderef, traits::Solution, Interner, Ty, TyBuilder, TyKind, }; @@ -131,18 +131,15 @@ impl<'a> InferenceContext<'a> { _ => return None, }; - let generic_params = crate::utils::generics(self.db.upcast(), coerce_unsized_trait.into()); - if generic_params.len() != 2 { - // The CoerceUnsized trait should have two generic params: Self and T. - return None; - } + let trait_ref = { + let b = TyBuilder::trait_ref(self.db, coerce_unsized_trait); + if b.remaining() != 2 { + // The CoerceUnsized trait should have two generic params: Self and T. + return None; + } + b.push(from_ty.clone()).push(to_ty.clone()).build() + }; - let substs = Substitution::build_for_generics(&generic_params) - .push(from_ty.clone()) - .push(to_ty.clone()) - .build(); - let trait_ref = - TraitRef { trait_id: to_chalk_trait_id(coerce_unsized_trait), substitution: substs }; let goal = InEnvironment::new(self.trait_env.env.clone(), trait_ref.cast(&Interner)); let canonicalizer = self.canonicalizer(); -- cgit v1.2.3