bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Normalize anon consts in new solver

Browse source
This commit is contained in:
Michael Goulet 2023-06-01 20:23:44 +00:00
parent 4fbb43e70f
commit 2c1473ca70
7 changed files with 115 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_infer/src/infer/combine.rs
View file

@ -227,7 +227,7 @@ impl<'tcx> InferCtxt<'tcx> {
return self.unify_const_variable(vid, a, relation.param_env());
}
(ty::ConstKind::Unevaluated(..), _) | (_, ty::ConstKind::Unevaluated(..))
if self.tcx.features().generic_const_exprs =>
if self.tcx.features().generic_const_exprs || self.tcx.trait_solver_next() =>
{
relation.register_const_equate_obligation(a, b);
return Ok(b);