bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

const_evaluatable_checked: fix occurs check

Browse source
This commit is contained in:
Bastian Kauschke 2020-12-02 14:33:26 +01:00
parent 92e4fb0732
commit 71d7550350
4 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/ty/relate.rs
View file

@ -33,6 +33,10 @@ pub trait TypeRelation<'tcx>: Sized {
/// relation. Just affects error messages.
fn a_is_expected(&self) -> bool;
fn visit_ct_substs(&self) -> bool {
false
}
fn with_cause<F, R>(&mut self, _cause: Cause, f: F) -> R
where
F: FnOnce(&mut Self) -> R,
@ -579,7 +583,7 @@ pub fn super_relate_consts<R: TypeRelation<'tcx>>(
(
ty::ConstKind::Unevaluated(a_def, a_substs, None),
ty::ConstKind::Unevaluated(b_def, b_substs, None),
) if tcx.features().const_evaluatable_checked => {
) if tcx.features().const_evaluatable_checked && !relation.visit_ct_substs() => {
if tcx.try_unify_abstract_consts(((a_def, a_substs), (b_def, b_substs))) {
Ok(a.val)
} else {