Skip to content

[COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary #143229

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Jul 1, 2025
Merged

[COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary #143229

merged 3 commits into from
Jul 1, 2025

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Jun 30, 2025 •
edited
Loading

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

This PR:

  • Moves some early config checks (some warnings) to the compiletest library.
  • Moves src/main.rs to src/bin/main.rs to make the separation (as in, compiletest's library component vs the tool binary component) more obvious.

r? @Kobzol (or reroll)

jieyouxu added 3 commits June 30, 2025 15:03
@jieyouxu
Move some early config checks to the compiletest lib
c8cef5b
@jieyouxu
Move compiletest main.rs to src/bin/
f03074d 
To make it obvious `compiletest`-the-tool has two components:

1. The core compiletest library, and
2. The tool binary, which will be executed by bootstrap.
@jieyouxu
Move RUST_TEST_NOCAPTURE warning to early config check
e664e7e
@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 Jun 30, 2025
@jieyouxu jieyouxu mentioned this pull request Jun 30, 2025
Merged
@Kobzol
Copy link
Member

Kobzol commented Jun 30, 2025

I'd probably just keep the "binary-only code" in the binary (the first commit), but it's a small thing.

Feel free to r=me.

@jieyouxu
Copy link
Member Author

jieyouxu commented Jun 30, 2025 •
edited
Loading

I'd probably just keep the "binary-only code" in the binary (the first commit), but it's a small thing.

FWIW, I moved that because it feels like they belong to the same "early configuration check". I want to revisit how the config is actually "finalized" (it's not only from cli args). I'm expecting a few more early config checks, and lib.rs isn't the intended eventual destination for these.

(This is more of an intermediate thing.)

@jieyouxu
Copy link
Member Author

@bors r=Kobzol rollup

@bors
Copy link
Collaborator

bors commented Jun 30, 2025

📌 Commit e664e7e has been approved by Kobzol

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 Jun 30, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 30, 2025
@matthiaskrgr
Rollup merge of rust-lang#143229 - jieyouxu:compiletest-maintenance-1…
69e7487 
…, r=Kobzol

[COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary

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

This PR:

- Moves some early config checks (some warnings) to the compiletest library.
- Moves `src/main.rs` to `src/bin/main.rs` to make the separation (as in, compiletest's library component vs the tool binary component) more obvious.

r? `@Kobzol` (or reroll)
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 30, 2025
Closed
bors added a commit that referenced this pull request Jun 30, 2025
@bors
Auto merge of #143250 - matthiaskrgr:rollup-hg2urog, r=matthiaskrgr
569455a 
Rollup of 5 pull requests

Successful merges:

 - #143156 (inherit `#[align]` from trait method prototypes)
 - #143223 (Improve macro stats printing)
 - #143229 ([COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary)
 - #143239 (GCC backend subtree update)
 - #143246 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 30, 2025
Merged
bors added a commit that referenced this pull request Jun 30, 2025
@bors
Auto merge of #143254 - matthiaskrgr:rollup-7x8bxek, r=matthiaskrgr
fdad98d 
Rollup of 9 pull requests

Successful merges:

 - #143019 (Ensure -V --verbose processes both codegen_backend and codegen-backend)
 - #143140 (give Pointer::into_parts a more scary name and offer a safer alternative)
 - #143175 (Make combining LLD with external LLVM config a hard error)
 - #143180 (Use `tracing-forest` instead of `tracing-tree` for bootstrap tracing)
 - #143223 (Improve macro stats printing)
 - #143228 (Handle build scripts better in `-Zmacro-stats` output.)
 - #143229 ([COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary)
 - #143246 (Subtree update of `rust-analyzer`)
 - #143248 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8156725 into rust-lang:master Jul 1, 2025
10 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 1, 2025
rust-timer added a commit that referenced this pull request Jul 1, 2025
@rust-timer
Unrolled build for #143229
405336e 
Rollup merge of #143229 - jieyouxu:compiletest-maintenance-1, r=Kobzol

[COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary

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

This PR:

- Moves some early config checks (some warnings) to the compiletest library.
- Moves `src/main.rs` to `src/bin/main.rs` to make the separation (as in, compiletest's library component vs the tool binary component) more obvious.

r? ``@Kobzol`` (or reroll)
@jieyouxu jieyouxu deleted the compiletest-maintenance-1 branch July 1, 2025 03:16
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jul 1, 2025
@bors
Auto merge of #143254 - matthiaskrgr:rollup-7x8bxek, r=matthiaskrgr
efec694 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#143019 (Ensure -V --verbose processes both codegen_backend and codegen-backend)
 - rust-lang/rust#143140 (give Pointer::into_parts a more scary name and offer a safer alternative)
 - rust-lang/rust#143175 (Make combining LLD with external LLVM config a hard error)
 - rust-lang/rust#143180 (Use `tracing-forest` instead of `tracing-tree` for bootstrap tracing)
 - rust-lang/rust#143223 (Improve macro stats printing)
 - rust-lang/rust#143228 (Handle build scripts better in `-Zmacro-stats` output.)
 - rust-lang/rust#143229 ([COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary)
 - rust-lang/rust#143246 (Subtree update of `rust-analyzer`)
 - rust-lang/rust#143248 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
antoyo pushed a commit to rust-lang/rustc_codegen_gcc that referenced this pull request Jul 12, 2025
@bors
Auto merge of #143254 - matthiaskrgr:rollup-7x8bxek, r=matthiaskrgr
44b7484 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#143019 (Ensure -V --verbose processes both codegen_backend and codegen-backend)
 - rust-lang/rust#143140 (give Pointer::into_parts a more scary name and offer a safer alternative)
 - rust-lang/rust#143175 (Make combining LLD with external LLVM config a hard error)
 - rust-lang/rust#143180 (Use `tracing-forest` instead of `tracing-tree` for bootstrap tracing)
 - rust-lang/rust#143223 (Improve macro stats printing)
 - rust-lang/rust#143228 (Handle build scripts better in `-Zmacro-stats` output.)
 - rust-lang/rust#143229 ([COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary)
 - rust-lang/rust#143246 (Subtree update of `rust-analyzer`)
 - rust-lang/rust#143248 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Jul 15, 2025
@bors
Auto merge of #143254 - matthiaskrgr:rollup-7x8bxek, r=matthiaskrgr
5329163 
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#143019 (Ensure -V --verbose processes both codegen_backend and codegen-backend)
 - rust-lang/rust#143140 (give Pointer::into_parts a more scary name and offer a safer alternative)
 - rust-lang/rust#143175 (Make combining LLD with external LLVM config a hard error)
 - rust-lang/rust#143180 (Use `tracing-forest` instead of `tracing-tree` for bootstrap tracing)
 - rust-lang/rust#143223 (Improve macro stats printing)
 - rust-lang/rust#143228 (Handle build scripts better in `-Zmacro-stats` output.)
 - rust-lang/rust#143229 ([COMPILETEST-UNTANGLE 1/N] Move some some early config checks to the lib and move the compiletest binary)
 - rust-lang/rust#143246 (Subtree update of `rust-analyzer`)
 - rust-lang/rust#143248 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Kobzol Kobzol

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.90.0
Development

Successfully merging this pull request may close these issues.
4 participants
@jieyouxu @Kobzol @bors @rustbot