Skip to content

compiletest: Extract auxiliary-crate properties to their own module/struct #131541

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Oct 11, 2024

Conversation

Zalathar
Copy link
Contributor

This moves the values of the 4 different aux-* directives into their own sub-struct. That struct, along with its directive-parsing code, can then be shared by both TestProps and EarlyProps.

The final patch also fixes an oversight in up-to-date checking, by including all auxiliary crates in the timestamp, not just ordinary aux-build ones.

This was previously only including ordinary `aux-build` crates, and not files
associated with the other three kinds of auxiliary crate.
@rustbot
Copy link
Collaborator

rustbot commented Oct 11, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

@rustbot rustbot added 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 Oct 11, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 11, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@Zalathar Zalathar added the A-compiletest Area: The compiletest test runner label Oct 11, 2024
@jieyouxu jieyouxu assigned jieyouxu and unassigned Mark-Simulacrum Oct 11, 2024
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, I would like to redo some of this handling because it's kinda insane to maintain, but in the short term this is a good improvement 👍 You can r=me once PR CI is green.

@Zalathar
Copy link
Contributor Author

CI is green.

@bors r=jieyouxu rollup=always

@bors
Copy link
Collaborator

bors commented Oct 11, 2024

📌 Commit ec662b9 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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 Oct 11, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 11, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#129079 (Create `_imp__` symbols also when doing ThinLTO)
 - rust-lang#131208 (ABI: Pass aggregates by value on AIX)
 - rust-lang#131394 (fix(rustdoc): add space between struct fields and their descriptions)
 - rust-lang#131519 (Use Default visibility for rustc-generated C symbol declarations)
 - rust-lang#131541 (compiletest: Extract auxiliary-crate properties to their own module/struct)
 - rust-lang#131542 (next-solver: remove outdated FIXMEs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7f79c1e into rust-lang:master Oct 11, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 11, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 11, 2024
Rollup merge of rust-lang#131541 - Zalathar:aux-props, r=jieyouxu

compiletest: Extract auxiliary-crate properties to their own module/struct

This moves the values of the 4 different `aux-*` directives into their own sub-struct. That struct, along with its directive-parsing code, can then be shared by both `TestProps` and `EarlyProps`.

The final patch also fixes an oversight in up-to-date checking, by including *all* auxiliary crates in the timestamp, not just ordinary `aux-build` ones.
@Zalathar Zalathar deleted the aux-props branch October 11, 2024 22:39
# for free to join this conversation on GitHub. Already have an account? # to comment
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
No open projects
Development

Successfully merging this pull request may close these issues.

5 participants