rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Do not remove previously added predicates in param_env, extend them instead

Browse Source
This commit is contained in:
Santiago Pastorino
2023-06-22 17:44:44 -03:00
parent 373293c3ca
commit 33d21e62d0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_ty_utils/src/ty.rs
View File

@@ -131,7 +131,9 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
if let Some(ImplTraitInTraitData::Trait { fn_def_id, .. }) if let Some(ImplTraitInTraitData::Trait { fn_def_id, .. })
| Some(ImplTraitInTraitData::Impl { fn_def_id, .. }) = tcx.opt_rpitit_info(def_id) | Some(ImplTraitInTraitData::Impl { fn_def_id, .. }) = tcx.opt_rpitit_info(def_id)
{ {
predicates = tcx.predicates_of(fn_def_id).instantiate_identity(tcx).predicates; // FIXME(-Zlower-impl-trait-in-trait-to-assoc-ty): Should not need to add the predicates
// from the parent fn to our assumptions
predicates.extend(tcx.predicates_of(fn_def_id).instantiate_identity(tcx).predicates);
} }
// Finally, we have to normalize the bounds in the environment, in // Finally, we have to normalize the bounds in the environment, in