diff options
| author | bors <bors@rust-lang.org> | 2024-09-12 10:17:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-12 10:17:32 +0000 |
| commit | f753bc769b16ca9673f11a4cc06e5cc681efd84e (patch) | |
| tree | f6f420c7a91cf89312587a03c1224cfefc95bd7c /compiler/rustc_trait_selection/src | |
| parent | 7c7372b6a1b9a8d6b787a3e5a10e4f8325b1fdfc (diff) | |
| parent | e866f8a97d1f08e8a187323a1a5838f88fe33d81 (diff) | |
| download | rust-f753bc769b16ca9673f11a4cc06e5cc681efd84e.tar.gz rust-f753bc769b16ca9673f11a4cc06e5cc681efd84e.zip | |
Auto merge of #130249 - compiler-errors:sad-new-solver-coherence, r=lcnr
Revert "Stabilize `-Znext-solver=coherence`" This is a clean revert of #121848, prepared by running: ``` $ git revert 17b322fa69eed7216dccc9f097eb68237cf62234 -m1 ``` Which effectively reverts: * a138a9261536ac2bdbb7c01a8aa9dc7d43299cae, 69fdd1457d367ce4de044e9784e58a38acf3d847, d93e047c9f1b33892a604273ab3931815f5604a1, 1a893ac648e03732aaa8b5371b602ab683970b0d see: https://rust-lang.zulipchat.com/#narrow/stream/364551-t-types.2Ftrait-system-refactor/topic/nalgebra.20hang Closes #130056 r? lcnr
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/engine.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/engine.rs b/compiler/rustc_trait_selection/src/traits/engine.rs index c8811bc37b3..de1d4ef15ac 100644 --- a/compiler/rustc_trait_selection/src/traits/engine.rs +++ b/compiler/rustc_trait_selection/src/traits/engine.rs @@ -35,8 +35,10 @@ where if infcx.next_trait_solver() { Box::new(NextFulfillmentCtxt::new(infcx)) } else { + let new_solver_globally = + infcx.tcx.sess.opts.unstable_opts.next_solver.map_or(false, |c| c.globally); assert!( - !infcx.tcx.next_trait_solver_globally(), + !new_solver_globally, "using old solver even though new solver is enabled globally" ); Box::new(FulfillmentContext::new(infcx)) |