about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-06 10:29:49 +0000
committerbors <bors@rust-lang.org>2023-07-06 10:29:49 +0000
commit4b6749b21e680a6280cf05ace533ae20c93d9bff (patch)
treecd8c871d1bdbbf229af8bd6310b095b460eddfbb /tests
parent4dd1719b3406d80f539d2f49e9842f3563908632 (diff)
parenta7532d9278961f5f6188a3a3f525034408812920 (diff)
downloadrust-4b6749b21e680a6280cf05ace533ae20c93d9bff.tar.gz
rust-4b6749b21e680a6280cf05ace533ae20c93d9bff.zip
Auto merge of #113406 - matthiaskrgr:rollup-0rprs5k, r=matthiaskrgr
Rollup of 4 pull requests

Successful merges:

 - #112295 (Fix the tests-listing-format-json test on Windows)
 - #113246 (fix compiletest crash)
 - #113395 (Dont ICE for `dyn* Trait: Trait` (built-in object) goals during selection in new trait solver)
 - #113402 (Diagnose unsorted CGUs.)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests')
-rw-r--r--tests/ui/dyn-star/box.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/ui/dyn-star/box.rs b/tests/ui/dyn-star/box.rs
index d1f1819d9f3..87c8356a174 100644
--- a/tests/ui/dyn-star/box.rs
+++ b/tests/ui/dyn-star/box.rs
@@ -1,5 +1,7 @@
 // run-pass
-// compile-flags: -C opt-level=0
+// revisions: current next
+//[current] compile-flags: -C opt-level=0
+//[next] compile-flags: -Ztrait-solver=next -C opt-level=0
 
 #![feature(dyn_star)]
 #![allow(incomplete_features)]