bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #93429 - fee1-dead-contrib:allow-super-trait-tilde-const, r=oli-obk

Browse source 
Allow `trait A: ~const B`

What's included: a minimal working change set for `~const` supertraits to work.

r? `@oli-obk`
This commit is contained in:
bors 2022-07-24 09:16:02 +00:00
commit b4151a41a0
9 changed files with 153 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_infer/src/traits/util.rs
View file

@ -145,7 +145,12 @@ impl<'tcx> Elaborator<'tcx> {
// Get predicates declared on the trait.
let predicates = tcx.super_predicates_of(data.def_id());
let obligations = predicates.predicates.iter().map(|&(pred, _)| {
let obligations = predicates.predicates.iter().map(|&(mut pred, _)| {
// when parent predicate is non-const, elaborate it to non-const predicates.
if data.constness == ty::BoundConstness::NotConst {
pred = pred.without_const(tcx);
}
predicate_obligation(
pred.subst_supertrait(tcx, &bound_predicate.rebind(data.trait_ref)),
obligation.param_env,