This commit is contained in:
Ellen 2021-01-27 14:46:43 +00:00
parent b0625eb712
commit f4261772d8
5 changed files with 11 additions and 1 deletions

View File

@ -612,6 +612,9 @@ pub(super) fn try_unify<'tcx>(
mut a: AbstractConst<'tcx>,
mut b: AbstractConst<'tcx>,
) -> bool {
// We substitute generics repeatedly to allow AbstractConsts to unify where a
// ConstKind::Unevalated could be turned into an AbstractConst that would unify e.g.
// Param(N) should unify with Param(T), substs: [Unevaluated("T2", [Unevaluated("T3", [Param(N)])])]
while let Node::Leaf(a_ct) = a.root() {
let a_ct = a_ct.subst(tcx, a.substs);
match AbstractConst::from_const(tcx, a_ct) {
@ -620,7 +623,6 @@ pub(super) fn try_unify<'tcx>(
Err(_) => return true,
}
}
while let Node::Leaf(b_ct) = b.root() {
let b_ct = b_ct.subst(tcx, b.substs);
match AbstractConst::from_const(tcx, b_ct) {

View File

@ -20,3 +20,5 @@ where
fn main() {
assert_eq!(caller::<4>(), 5);
}
// Test that the ``(N1 + 1) + 1`` bound on ``caller`` satisfies the ``M2 + 1`` bound on ``callee``

View File

@ -30,3 +30,5 @@ where
fn main() {
assert_eq!((Generic::<10>).bar(), 11);
}
// Test that the ``ConstU64<{ K + 1 - 1}>`` bound on ``bar``'s impl block satisfies the ``ConstU64<{K - 1}>`` bound on ``foo``'s impl block

View File

@ -30,3 +30,5 @@ where
fn main() {
assert_eq!(substs3::<2>().0, [0; 3]);
}
// Test that the ``{ (L - 1) * 2 + 1 }`` bound on ``substs3`` satisfies the ``{ N + 1 }`` bound on ``Substs1``

View File

@ -24,3 +24,5 @@ fn substs3<const L: usize>() -> Substs1<{ (L) }> {
fn main() {
assert_eq!(substs3::<2>().0, [0; 2]);
}
// Test that the implicit ``{ (L) }`` bound on ``substs3`` satisfies the ``{ (N) }`` bound on ``Substs1``