Skip to content

Commit

Permalink
Unrolled build for rust-lang#123969
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#123969 - oli-obk:define_opaque_types6, r=compiler-errors

The new solver ignores `DefineOpaqueTypes`, so switch it to `Yes`

We assert that we are in the new solver in the line above

r? ``@compiler-errors``
  • Loading branch information
rust-timer authored Apr 16, 2024
2 parents 1dea922 + 67334df commit d5bd0d4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_infer/src/infer/at.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ impl<'a, 'tcx> Trace<'a, 'tcx> {
{
let Trace { at, trace } = self;
debug_assert!(at.infcx.next_trait_solver());
let mut fields = at.infcx.combine_fields(trace, at.param_env, DefineOpaqueTypes::No);
let mut fields = at.infcx.combine_fields(trace, at.param_env, DefineOpaqueTypes::Yes);
fields
.equate(StructurallyRelateAliases::Yes)
.relate(a, b)
Expand Down

0 comments on commit d5bd0d4

Please sign in to comment.