Skip to content

compiletest: -Zunstable-options for json targets#152236

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
davidtwco:compiletest-destabilise-custom-targets
Feb 9, 2026
Merged

compiletest: -Zunstable-options for json targets#152236
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
davidtwco:compiletest-destabilise-custom-targets

Conversation

@davidtwco
Copy link
Member

@davidtwco davidtwco commented Feb 6, 2026 •
edited by SpriteOvO
Loading

bootstrap runs compiletest with synthetic custom targets when blessing mir-opt tests, but that no longer works after #150151/#151534 because -Zunstable-options is required

Contexts on Zulips.

@rustbot
Copy link
Collaborator

rustbot commented Feb 6, 2026

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 6, 2026
@rustbot
Copy link
Collaborator

rustbot commented Feb 6, 2026

r? @Zalathar

rustbot has assigned @Zalathar.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @jieyouxu, @oli-obk, @wesleywiser, bootstrap
  • @jieyouxu, @oli-obk, @wesleywiser, bootstrap expanded to 8 candidates
  • Random selection from Mark-Simulacrum, Zalathar, clubby789, jieyouxu

SpriteOvO
SpriteOvO reviewed Feb 6, 2026
View reviewed changes
Copy link
Member

@SpriteOvO SpriteOvO left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on my machine, works fine now~

Maybe we should find time to add bless tests to CI, at least ensure it compiles so we don't miss it next time.

View changes since this review

@Zalathar
Copy link
Member

Zalathar commented Feb 7, 2026

So to double-check my understanding:

  • x test mir-opt --bless is currently broken on main due to the destabilization
  • This wasn't caught at the time because, like several other dev aids, we don't specifically test blessing in CI
  • This PR makes small changes to get it working again

Zalathar
Zalathar reviewed Feb 7, 2026
View reviewed changes
scottmcm
scottmcm approved these changes Feb 7, 2026
View reviewed changes
Copy link
Member

@scottmcm scottmcm left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I should have looked for this before fixing it locally. I made essentially the same change.

r=me with the comment typo fixed

View changes since this review

@davidtwco davidtwco force-pushed the compiletest-destabilise-custom-targets branch from 19fb579 to 43e5203 Compare February 9, 2026 13:48
@davidtwco
Copy link
Member Author

davidtwco commented Feb 9, 2026

@bors r=scottmcm

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 9, 2026

📌 Commit 43e5203 has been approved by scottmcm

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 9, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152236 - davidtwco:compiletest-destabilise-…
2fdafa9 
…custom-targets, r=scottmcm

compiletest: `-Zunstable-options` for json targets

bootstrap runs compiletest with synthetic custom targets when blessing `mir-opt` tests, but that no longer works after rust-lang#150151/rust-lang#151534 because `-Zunstable-options` is required

Contexts on [Zulips](https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/custom.20targets.20are.20unstable.20and.20require.20.60-Zunstable-options.60).
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 9, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 9, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152236 - davidtwco:compiletest-destabilise-…
4cccc1f 
…custom-targets, r=scottmcm

compiletest: `-Zunstable-options` for json targets

bootstrap runs compiletest with synthetic custom targets when blessing `mir-opt` tests, but that no longer works after rust-lang#150151/rust-lang#151534 because `-Zunstable-options` is required

Contexts on [Zulips](https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/custom.20targets.20are.20unstable.20and.20require.20.60-Zunstable-options.60).
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 9, 2026
Closed
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 9, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152236 - davidtwco:compiletest-destabilise-…
e251d67 
…custom-targets, r=scottmcm

compiletest: `-Zunstable-options` for json targets

bootstrap runs compiletest with synthetic custom targets when blessing `mir-opt` tests, but that no longer works after rust-lang#150151/rust-lang#151534 because `-Zunstable-options` is required

Contexts on [Zulips](https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/custom.20targets.20are.20unstable.20and.20require.20.60-Zunstable-options.60).
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 9, 2026
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 9, 2026
Merged
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 9, 2026
@JonathanBrouwer
Rollup merge of rust-lang#152236 - davidtwco:compiletest-destabilise-…
458ba4c 
…custom-targets, r=scottmcm

compiletest: `-Zunstable-options` for json targets

bootstrap runs compiletest with synthetic custom targets when blessing `mir-opt` tests, but that no longer works after rust-lang#150151/rust-lang#151534 because `-Zunstable-options` is required

Contexts on [Zulips](https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/custom.20targets.20are.20unstable.20and.20require.20.60-Zunstable-options.60).
@JonathanBrouwer JonathanBrouwer mentioned this pull request Feb 9, 2026
Closed
rust-bors bot pushed a commit that referenced this pull request Feb 9, 2026
@bors
Auto merge of #152399 - matthiaskrgr:rollup-uDIDnAN, r=matthiaskrgr
72f50fc 
Rollup of 12 pull requests

Successful merges:

 - #152388 (`rust-analyzer` subtree update)
 - #151613 (Align `ArrayWindows` trait impls with `Windows`)
 - #152134 (Set crt_static_allow_dylibs to true for Emscripten target)
 - #152166 (cleanup some more things in `proc_macro::bridge`)
 - #152236 (compiletest: `-Zunstable-options` for json targets)
 - #152287 (Fix an ICE in the vtable iteration for a trait reference in const eval when a supertrait not implemented)
 - #142957 (std: introduce path normalize methods at top of `std::path`)
 - #145504 (Add some conversion trait impls)
 - #152131 (Port rustc_no_implicit_bounds attribute to parser.)
 - #152315 (fix: rhs_span to rhs_span_new)
 - #152327 (Check stalled coroutine obligations eagerly)
 - #152377 (Rename the query system's `JobOwner` to `ActiveJobGuard`, and include `key_hash`)
rust-bors bot pushed a commit that referenced this pull request Feb 9, 2026
@bors
Auto merge of #152399 - matthiaskrgr:rollup-uDIDnAN, r=matthiaskrgr
1fc607b 
Rollup of 12 pull requests

Successful merges:

 - #152388 (`rust-analyzer` subtree update)
 - #151613 (Align `ArrayWindows` trait impls with `Windows`)
 - #152134 (Set crt_static_allow_dylibs to true for Emscripten target)
 - #152166 (cleanup some more things in `proc_macro::bridge`)
 - #152236 (compiletest: `-Zunstable-options` for json targets)
 - #152287 (Fix an ICE in the vtable iteration for a trait reference in const eval when a supertrait not implemented)
 - #142957 (std: introduce path normalize methods at top of `std::path`)
 - #145504 (Add some conversion trait impls)
 - #152131 (Port rustc_no_implicit_bounds attribute to parser.)
 - #152315 (fix: rhs_span to rhs_span_new)
 - #152327 (Check stalled coroutine obligations eagerly)
 - #152377 (Rename the query system's `JobOwner` to `ActiveJobGuard`, and include `key_hash`)
rust-bors bot pushed a commit that referenced this pull request Feb 9, 2026
@bors
Auto merge of #152399 - matthiaskrgr:rollup-uDIDnAN, r=matthiaskrgr
18d13b5 
Rollup of 12 pull requests

Successful merges:

 - #152388 (`rust-analyzer` subtree update)
 - #151613 (Align `ArrayWindows` trait impls with `Windows`)
 - #152134 (Set crt_static_allow_dylibs to true for Emscripten target)
 - #152166 (cleanup some more things in `proc_macro::bridge`)
 - #152236 (compiletest: `-Zunstable-options` for json targets)
 - #152287 (Fix an ICE in the vtable iteration for a trait reference in const eval when a supertrait not implemented)
 - #142957 (std: introduce path normalize methods at top of `std::path`)
 - #145504 (Add some conversion trait impls)
 - #152131 (Port rustc_no_implicit_bounds attribute to parser.)
 - #152315 (fix: rhs_span to rhs_span_new)
 - #152327 (Check stalled coroutine obligations eagerly)
 - #152377 (Rename the query system's `JobOwner` to `ActiveJobGuard`, and include `key_hash`)
@rust-bors rust-bors bot merged commit 19122c0 into rust-lang:main Feb 9, 2026
11 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Feb 9, 2026
rust-timer added a commit that referenced this pull request Feb 9, 2026
@rust-timer
Unrolled build for #152236
8b24d47 
Rollup merge of #152236 - davidtwco:compiletest-destabilise-custom-targets, r=scottmcm

compiletest: `-Zunstable-options` for json targets

bootstrap runs compiletest with synthetic custom targets when blessing `mir-opt` tests, but that no longer works after #150151/#151534 because `-Zunstable-options` is required

Contexts on [Zulips](https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/custom.20targets.20are.20unstable.20and.20require.20.60-Zunstable-options.60).
@davidtwco davidtwco deleted the compiletest-destabilise-custom-targets branch February 12, 2026 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Zalathar Zalathar Zalathar left review comments

@SpriteOvO SpriteOvO SpriteOvO left review comments

@scottmcm scottmcm scottmcm approved these changes

Assignees

@Zalathar Zalathar

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.95.0

Development

Successfully merging this pull request may close these issues.

5 participants

@davidtwco @rustbot @Zalathar @scottmcm @SpriteOvO