Skip to content

Batched compiletest Config fixups - #149574

Merged
bors merged 5 commits into
rust-lang:mainfrom
jieyouxu:compiletest-cli
Dec 4, 2025
Merged

Batched compiletest Config fixups#149574
bors merged 5 commits into
rust-lang:mainfrom
jieyouxu:compiletest-cli

Conversation

@jieyouxu

@jieyouxujieyouxu commented Dec 3, 2025

Copy link
Copy Markdown
Member

A few batched compiletestConfig self-consistency fixups, mostly to get it out of the way for follow-up changes I would like to make (namely, I would like to slightly cleanup the config parsing logic).

Review remarks

Changes are best reviewed commit-by-commit. This PR should contain no functional changes.

r? @Zalathar (or bootstrap/compiler)

@rustbot

rustbot commented Dec 3, 2025

Copy link
Copy Markdown
Collaborator

compiletest directives have been modified. Please add or update docs for the
new or modified directive in src/doc/rustc-dev-guide/.

@rustbotrustbot 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 Dec 3, 2025
jieyouxu
jieyouxu commented Dec 3, 2025
View reviewed changes
Comment threadsrc/tools/compiletest/src/lib.rs
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu

jieyouxu commented Dec 3, 2025•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Huh? Confusing book test failure...

EDIT: tracked in #149575

@jieyouxujieyouxu closed this Dec 3, 2025
@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 3, 2025
@jieyouxujieyouxu reopened this Dec 3, 2025
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 3, 2025
@jieyouxujieyouxu mentioned this pull request Dec 3, 2025
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
Zalathar
Zalathar reviewed Dec 3, 2025
View reviewed changes
Comment threadsrc/tools/compiletest/src/common.rs Outdated
@jieyouxu

jieyouxu commented Dec 3, 2025

Copy link
Copy Markdown
MemberAuthor

@rustbot author

@rustbotrustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 3, 2025
Zalathar
Zalathar reviewed Dec 3, 2025
View reviewed changes
Comment threadsrc/tools/compiletest/src/common.rs Outdated
@rustbot

rustbot commented Dec 3, 2025

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@jieyouxu

jieyouxu commented Dec 3, 2025

Copy link
Copy Markdown
MemberAuthor

@rustbot review

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 3, 2025
@Zalathar

Zalathar commented Dec 4, 2025

Copy link
Copy Markdown
Member

Looks good.

@bors r+ rollup

@bors

bors commented Dec 4, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit c18cd27 has been approved by Zalathar

It is now in the queue for this repository.

@borsbors 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 Dec 4, 2025
@matthiaskrgrmatthiaskrgr mentioned this pull request Dec 4, 2025
Merged
bors added a commit that referenced this pull request Dec 4, 2025
@bors
Auto merge of#149632- matthiaskrgr:rollup-c5iqgtn, r=matthiaskrgr
29e035e
Rollup of 10 pull requests
Successful merges:
- #149521 (Improve `io::Error::downcast`)
- #149544 (Only apply `no_mangle_const_items`'s suggestion to plain const items)
- #149545 (fix the check for which expressions read never type)
- #149570 (rename cortex-ar references to unified aarch32)
- #149574 (Batched compiletest Config fixups)
- #149579 (Motor OS: fix compile error)
- #149595 (Tidying up `tests/ui/issues` tests [2/N])
- #149597 (Revert "implement and test `Iterator::{exactly_one, collect_array}`")
- #149608 (Allow PowerPC spe_acc as clobber-only register)
- #149610 (Implement benchmarks for uN::{gather,scatter}_bits)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit b54ff3d into rust-lang:mainDec 4, 2025
11 checks passed
@rustbotrustbot added this to the 1.93.0 milestone Dec 4, 2025
rust-timer added a commit that referenced this pull request Dec 4, 2025
@rust-timer
Unrolled build for#149574
ef18955
Rollup merge of #149574 - jieyouxu:compiletest-cli, r=Zalathar
Batched compiletest Config fixups
A few batched `compiletest` `Config` self-consistency fixups, mostly to get it out of the way for follow-up changes I would like to make (namely, I would like to slightly cleanup the config parsing logic).
### Review remarks
Changes are best reviewed commit-by-commit. This PR should contain no functional changes.
r? `@Zalathar` (or bootstrap/compiler)
@jieyouxu
jieyouxu deleted the compiletest-cli branch December 4, 2025 23:48
github-actionsBot pushed a commit to rust-lang/compiler-builtins that referenced this pull request Dec 11, 2025
@bors
Auto merge of #149632 - matthiaskrgr:rollup-c5iqgtn, r=matthiaskrgr
07a87c1
Rollup of 10 pull requests
Successful merges:
- rust-lang/rust#149521 (Improve `io::Error::downcast`)
- rust-lang/rust#149544 (Only apply `no_mangle_const_items`'s suggestion to plain const items)
- rust-lang/rust#149545 (fix the check for which expressions read never type)
- rust-lang/rust#149570 (rename cortex-ar references to unified aarch32)
- rust-lang/rust#149574 (Batched compiletest Config fixups)
- rust-lang/rust#149579 (Motor OS: fix compile error)
- rust-lang/rust#149595 (Tidying up `tests/ui/issues` tests [2/N])
- rust-lang/rust#149597 (Revert "implement and test `Iterator::{exactly_one, collect_array}`")
- rust-lang/rust#149608 (Allow PowerPC spe_acc as clobber-only register)
- rust-lang/rust#149610 (Implement benchmarks for uN::{gather,scatter}_bits)
r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/rustc_codegen_gcc that referenced this pull request Dec 21, 2025
@bors
Auto merge of #149632 - matthiaskrgr:rollup-c5iqgtn, r=matthiaskrgr
103f9f6
Rollup of 10 pull requests
Successful merges:
- rust-lang/rust#149521 (Improve `io::Error::downcast`)
- rust-lang/rust#149544 (Only apply `no_mangle_const_items`'s suggestion to plain const items)
- rust-lang/rust#149545 (fix the check for which expressions read never type)
- rust-lang/rust#149570 (rename cortex-ar references to unified aarch32)
- rust-lang/rust#149574 (Batched compiletest Config fixups)
- rust-lang/rust#149579 (Motor OS: fix compile error)
- rust-lang/rust#149595 (Tidying up `tests/ui/issues` tests [2/N])
- rust-lang/rust#149597 (Revert "implement and test `Iterator::{exactly_one, collect_array}`")
- rust-lang/rust#149608 (Allow PowerPC spe_acc as clobber-only register)
- rust-lang/rust#149610 (Implement benchmarks for uN::{gather,scatter}_bits)
r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request Aug 17, 2026
@bors
Auto merge of #149632 - matthiaskrgr:rollup-c5iqgtn, r=matthiaskrgr
2d5de7b
Rollup of 10 pull requests
Successful merges:
- rust-lang/rust#149521 (Improve `io::Error::downcast`)
- rust-lang/rust#149544 (Only apply `no_mangle_const_items`'s suggestion to plain const items)
- rust-lang/rust#149545 (fix the check for which expressions read never type)
- rust-lang/rust#149570 (rename cortex-ar references to unified aarch32)
- rust-lang/rust#149574 (Batched compiletest Config fixups)
- rust-lang/rust#149579 (Motor OS: fix compile error)
- rust-lang/rust#149595 (Tidying up `tests/ui/issues` tests [2/N])
- rust-lang/rust#149597 (Revert "implement and test `Iterator::{exactly_one, collect_array}`")
- rust-lang/rust#149608 (Allow PowerPC spe_acc as clobber-only register)
- rust-lang/rust#149610 (Implement benchmarks for uN::{gather,scatter}_bits)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ZalatharZalatharZalathar left review comments

Assignees

@ZalatharZalathar

Labels

A-compiletestArea: The compiletest test runnerA-testsuiteArea: The testsuite used to check the correctness of rustcS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.93.0

Development

Successfully merging this pull request may close these issues.

5 participants

@jieyouxu@rustbot@rust-log-analyzer@Zalathar@bors