diff options
| author | Michael Goulet <michael@errs.io> | 2024-05-13 10:00:38 -0400 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2024-05-13 11:59:42 -0400 |
| commit | 3bcdf3058ef3eaef5042661cf8301acfbcddce65 (patch) | |
| tree | 3f91249a55f4a965a51ca35dce52e63b55aa398b /compiler/rustc_trait_selection/src/solve/assembly | |
| parent | ecbe3fd550fccd2cba17ea7e86539bf3e0bfc618 (diff) | |
| download | rust-3bcdf3058ef3eaef5042661cf8301acfbcddce65.tar.gz rust-3bcdf3058ef3eaef5042661cf8301acfbcddce65.zip | |
split out AliasTy -> AliasTerm
Diffstat (limited to 'compiler/rustc_trait_selection/src/solve/assembly')
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/assembly/structural_traits.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/solve/assembly/structural_traits.rs b/compiler/rustc_trait_selection/src/solve/assembly/structural_traits.rs index eeaef028cdb..1474f8a679b 100644 --- a/compiler/rustc_trait_selection/src/solve/assembly/structural_traits.rs +++ b/compiler/rustc_trait_selection/src/solve/assembly/structural_traits.rs @@ -698,7 +698,7 @@ pub(in crate::solve) fn predicates_for_object_candidate<'tcx>( old_ty, None, "{} has two generic parameters: {} and {}", - proj.projection_ty, + proj.projection_term, proj.term, old_ty.unwrap() ); @@ -739,7 +739,11 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReplaceProjectionWith<'_, 'tcx> { // FIXME: Technically this equate could be fallible... self.nested.extend( self.ecx - .eq_and_get_goals(self.param_env, alias_ty, proj.projection_ty) + .eq_and_get_goals( + self.param_env, + alias_ty, + proj.projection_term.expect_ty(self.ecx.tcx()), + ) .expect("expected to be able to unify goal projection with dyn's projection"), ); proj.term.ty().unwrap() |