Unrolled build for rust-lang#123969

rust-timer · web-flow · commit d5bd0d4fa7ff · 2024-04-16T15:40:33.000-04:00
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``
diff --git a/compiler/rustc_infer/src/infer/at.rs b/compiler/rustc_infer/src/infer/at.rs
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ impl<'a, 'tcx> Trace<'a, 'tcx> {`
`282`	`282`	`{`
`283`	`283`	`let Trace { at, trace } = self;`
`284`	`284`	`debug_assert!(at.infcx.next_trait_solver());`
`285`		`- let mut fields = at.infcx.combine_fields(trace, at.param_env, DefineOpaqueTypes::No);`
	`285`	`+ let mut fields = at.infcx.combine_fields(trace, at.param_env, DefineOpaqueTypes::Yes);`
`286`	`286`	`fields`
`287`	`287`	`.equate(StructurallyRelateAliases::Yes)`
`288`	`288`	`.relate(a, b)`