bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

don't let const_fn feature flag affect impl-block-level trait bounds

Browse source
This commit is contained in:
Ralf Jung 2021-04-25 18:42:53 +02:00
parent ada102456d
commit 9a852776f4
11 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -426,7 +426,7 @@ impl Validator<'mir, 'tcx> {
ty::PredicateKind::Subtype(_) => {
bug!("subtype predicate on function: {:#?}", predicate)
}
ty::PredicateKind::Trait(pred, constness) => {
ty::PredicateKind::Trait(pred, _constness) => {
if Some(pred.def_id()) == tcx.lang_items().sized_trait() {
continue;
}
@ -440,16 +440,7 @@ impl Validator<'mir, 'tcx> {
// arguments when determining importance.
let kind = LocalKind::Arg;
if constness == hir::Constness::Const {
self.check_op_spanned(ops::ty::TraitBound(kind), span);
} else if !tcx.features().const_fn
|| self.ccx.is_const_stable_const_fn()
{
// HACK: We shouldn't need the conditional above, but trait
// bounds on containing impl blocks are wrongly being marked as
// "not-const".
self.check_op_spanned(ops::ty::TraitBound(kind), span);
}
self.check_op_spanned(ops::ty::TraitBound(kind), span);
}
// other kinds of bounds are either tautologies
// or cause errors in other passes