Skip to content

[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest - #143232

Merged
bors merged 3 commits into
rust-lang:masterfrom
jieyouxu:compiletest-maintenance-3
Jul 2, 2025
Merged

[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest#143232
bors merged 3 commits into
rust-lang:masterfrom
jieyouxu:compiletest-maintenance-3

Conversation

@jieyouxu

@jieyouxujieyouxu commented Jun 30, 2025

Copy link
Copy Markdown
Member

This is part of a patch series to untangle compiletest to hopefully nudge it towards being more maintainable.

Instead of using both "headers" and "directives" within compiletest to refer to the same thing. This of course induces some churn, but it's been bugging me for a while, and I rather do the self-consistency changes now than later.

The first commit tries to be mostly move-only to help per-file git history.

I intend to revisit rustc-dev-guide's testing docs, but I don't want to do it on rust-lang/rust side because it would need syncing and might conflict.

@rustbotrustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 30, 2025
@Kobzol

Copy link
Copy Markdown
Member

r? @Kobzol

You can r=me on the last three commits.

@jieyouxu
jieyouxuforce-pushed the compiletest-maintenance-3 branch 3 times, most recently from 69af97e to 9d187f3CompareJuly 1, 2025 05:14
compiletest has confusingly two terminology to refer to the same concept
-- "headers" and "directives". To make this more self-consistent and
less confusing, stick with "directives" only.
This commit **intentionally** tries to be limited to move-only (modulo
some key usage reference renames) to help git history.
@jieyouxu
jieyouxuforce-pushed the compiletest-maintenance-3 branch from 9d187f3 to 0346895CompareJuly 2, 2025 04:08
@jieyouxujieyouxu changed the title [STACKED] [COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletestJul 2, 2025
@jieyouxu
jieyouxu marked this pull request as ready for review July 2, 2025 04:08
@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2025
@jieyouxu

Copy link
Copy Markdown
MemberAuthor

Rebased.
@bors r=Kobzol rollup

@bors

bors commented Jul 2, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 0346895 has been approved by Kobzol

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 Jul 2, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Jul 2, 2025
…, r=Kobzol
[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest
Instead of using *both* "headers" and "directives" within compiletest to refer to the same thing. This of course induces some churn, but it's been bugging me for a while, and I rather do the self-consistency changes now than later.
The first commit tries to be mostly move-only to help per-file git history.
I intend to revisit rustc-dev-guide's testing docs, but I don't want to do it on rust-lang/rust side because it would need syncing and might conflict.
@jhprattjhpratt mentioned this pull request Jul 2, 2025
bors added a commit that referenced this pull request Jul 2, 2025
Rollup of 12 pull requests
Successful merges:
- #141847 (Explain `TOCTOU` on the top of `std::fs`, and reference it in functions)
- #142138 (Add `Vec::into_chunks`)
- #142321 (Expose elf abi on ppc64 targets)
- #142886 (ci: aarch64-gnu: Stop skipping `panic_abort_doc_tests`)
- #143038 (avoid suggesting traits from private dependencies)
- #143194 (fix bitcast of single-element SIMD vectors)
- #143206 (Align attr fixes)
- #143231 (Suggest use another lifetime specifier instead of underscore lifetime)
- #143232 ([COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest)
- #143258 (Don't recompute `DisambiguatorState` for every RPITIT in trait definition)
- #143260 (Use the correct export kind for __rust_alloc_error_handler_should_panic)
- #143274 (ci: support optional jobs)
r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 2, 2025
…, r=Kobzol
[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest
Instead of using *both* "headers" and "directives" within compiletest to refer to the same thing. This of course induces some churn, but it's been bugging me for a while, and I rather do the self-consistency changes now than later.
The first commit tries to be mostly move-only to help per-file git history.
I intend to revisit rustc-dev-guide's testing docs, but I don't want to do it on rust-lang/rust side because it would need syncing and might conflict.
bors added a commit that referenced this pull request Jul 2, 2025
Rollup of 11 pull requests
Successful merges:
- #141847 (Explain `TOCTOU` on the top of `std::fs`, and reference it in functions)
- #142138 (Add `Vec::into_chunks`)
- #142321 (Expose elf abi on ppc64 targets)
- #142886 (ci: aarch64-gnu: Stop skipping `panic_abort_doc_tests`)
- #143038 (avoid suggesting traits from private dependencies)
- #143194 (fix bitcast of single-element SIMD vectors)
- #143231 (Suggest use another lifetime specifier instead of underscore lifetime)
- #143232 ([COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest)
- #143258 (Don't recompute `DisambiguatorState` for every RPITIT in trait definition)
- #143260 (Use the correct export kind for __rust_alloc_error_handler_should_panic)
- #143274 (ci: support optional jobs)
r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 2, 2025
…, r=Kobzol
[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest
Instead of using *both* "headers" and "directives" within compiletest to refer to the same thing. This of course induces some churn, but it's been bugging me for a while, and I rather do the self-consistency changes now than later.
The first commit tries to be mostly move-only to help per-file git history.
I intend to revisit rustc-dev-guide's testing docs, but I don't want to do it on rust-lang/rust side because it would need syncing and might conflict.
bors added a commit that referenced this pull request Jul 2, 2025
Rollup of 10 pull requests
Successful merges:
- #141847 (Explain `TOCTOU` on the top of `std::fs`, and reference it in functions)
- #142138 (Add `Vec::into_chunks`)
- #142321 (Expose elf abi on ppc64 targets)
- #142886 (ci: aarch64-gnu: Stop skipping `panic_abort_doc_tests`)
- #143194 (fix bitcast of single-element SIMD vectors)
- #143231 (Suggest use another lifetime specifier instead of underscore lifetime)
- #143232 ([COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest)
- #143258 (Don't recompute `DisambiguatorState` for every RPITIT in trait definition)
- #143260 (Use the correct export kind for __rust_alloc_error_handler_should_panic)
- #143274 (ci: support optional jobs)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 2, 2025
Rollup of 9 pull requests
Successful merges:
- #141847 (Explain `TOCTOU` on the top of `std::fs`, and reference it in functions)
- #142138 (Add `Vec::into_chunks`)
- #142321 (Expose elf abi on ppc64 targets)
- #142886 (ci: aarch64-gnu: Stop skipping `panic_abort_doc_tests`)
- #143194 (fix bitcast of single-element SIMD vectors)
- #143231 (Suggest use another lifetime specifier instead of underscore lifetime)
- #143232 ([COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest)
- #143258 (Don't recompute `DisambiguatorState` for every RPITIT in trait definition)
- #143274 (ci: support optional jobs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit df7cac9 into rust-lang:masterJul 2, 2025
@rustbotrustbot added this to the 1.90.0 milestone Jul 2, 2025
rust-timer added a commit that referenced this pull request Jul 2, 2025
Rollup merge of #143232 - jieyouxu:compiletest-maintenance-3, r=Kobzol
[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest
Instead of using *both* "headers" and "directives" within compiletest to refer to the same thing. This of course induces some churn, but it's been bugging me for a while, and I rather do the self-consistency changes now than later.
The first commit tries to be mostly move-only to help per-file git history.
I intend to revisit rustc-dev-guide's testing docs, but I don't want to do it on rust-lang/rust side because it would need syncing and might conflict.
@jieyouxu
jieyouxu deleted the compiletest-maintenance-3 branch July 2, 2025 23:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

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)T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@jieyouxu@Kobzol@bors@rustbot