compiletest: Remove old-output-capture and become a stage0 bootstrap tool by Zalathar · Pull Request #146929 · rust-lang/rust

Zalathar · 2025-09-23T11:47:51Z

The new compiletest output-capture system became the default in #146574, and no problems have been reported since.

This PR therefore removes the old output-capture implementation from compiletest, and adjusts bootstrap to always build and test compiletest as a stage0 bootstrap tool.

In other words, compiletest no longer relies on any unstable features (such as libtest or internal_output_capture), and is now written entirely in stable Rust!

The compiletest self-tests still need access to an in-tree rustc, in order to obtain information via rustc --print, so we interpret --stage as indicating the stage of that secondary compiler, but always use the stage0 compiler to build compiletest itself.

r? Kobzol

rustbot · 2025-09-23T11:47:55Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Kobzol

This looks really great, thank you for working on it! I'd wait maybe a few couple of days or until next week, but then I'm fine with merging this. jieyouxu will probably also want to take a look.

View changes since this review

src/bootstrap/src/core/build_steps/check.rs

src/bootstrap/src/core/config/config.rs

jieyouxu · 2025-09-23T12:08:43Z

I would time this approx. next Monday, also we should wait for the bootstrap compiler bump next doors in #146636

jieyouxu · 2025-09-27T03:57:52Z

@rustbot blocked (until next Monday)

bors · 2025-09-28T04:47:56Z

☔ The latest upstream changes (presumably #147104) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2025-09-28T05:19:56Z

This PR was rebased onto a different master 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

Nice!

View changes since this review

jieyouxu · 2025-09-29T00:59:14Z

@bors r=Kobzol,jieyouxu rollup

bors · 2025-09-29T00:59:16Z

📌 Commit 8b18798 has been approved by Kobzol,jieyouxu

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - #133477 (Detect tuple structs that are unconstructable due to re-export) - #146929 (compiletest: Remove old-output-capture and become a stage0 bootstrap tool) - #146979 (constify Default on Nanoseconds) - #147092 (Do not compute optimized MIR if code does not type-check.) - #147112 (all 48 keywords in just 300 characters) - #147122 (Fix some crash-test directives) - #147127 (Add a leading dash to linker plugin arguments in the gcc codegen) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146929 - Zalathar:capture, r=Kobzol,jieyouxu compiletest: Remove old-output-capture and become a stage0 bootstrap tool The new compiletest output-capture system became the default in #146574, and no problems have been reported since. This PR therefore removes the old output-capture implementation from compiletest, and adjusts bootstrap to always build and test compiletest as a stage0 bootstrap tool. In other words, compiletest no longer relies on any unstable features (such as `libtest` or `internal_output_capture`), and is now written entirely in stable Rust! The compiletest self-tests still need access to an in-tree rustc, in order to obtain information via `rustc --print`, so we interpret `--stage` as indicating the stage of that secondary compiler, but always use the stage0 compiler to build compiletest itself. r? Kobzol

… r=Zalathar,jieyouxu Remove usage of `compiletest-use-stage0-libtest` from CI It shouldn't be needed anymore after rust-lang#146929. r? `@Zalathar`

Rollup merge of #147188 - Kobzol:remove-compiletest-stage-1, r=Zalathar,jieyouxu Remove usage of `compiletest-use-stage0-libtest` from CI It shouldn't be needed anymore after #146929. r? `@Zalathar`

Rollup of 7 pull requests Successful merges: - rust-lang#133477 (Detect tuple structs that are unconstructable due to re-export) - rust-lang#146929 (compiletest: Remove old-output-capture and become a stage0 bootstrap tool) - rust-lang#146979 (constify Default on Nanoseconds) - rust-lang#147092 (Do not compute optimized MIR if code does not type-check.) - rust-lang#147112 (all 48 keywords in just 300 characters) - rust-lang#147122 (Fix some crash-test directives) - rust-lang#147127 (Add a leading dash to linker plugin arguments in the gcc codegen) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 7 pull requests Successful merges: - rust-lang/rust#133477 (Detect tuple structs that are unconstructable due to re-export) - rust-lang/rust#146929 (compiletest: Remove old-output-capture and become a stage0 bootstrap tool) - rust-lang/rust#146979 (constify Default on Nanoseconds) - rust-lang/rust#147092 (Do not compute optimized MIR if code does not type-check.) - rust-lang/rust#147112 (all 48 keywords in just 300 characters) - rust-lang/rust#147122 (Fix some crash-test directives) - rust-lang/rust#147127 (Add a leading dash to linker plugin arguments in the gcc codegen) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned Kobzol Sep 23, 2025

Zalathar force-pushed the capture branch from 0b8b454 to f54b28e Compare September 23, 2025 11:51

Kobzol approved these changes Sep 23, 2025

View reviewed changes

src/bootstrap/src/core/build_steps/check.rs Outdated Show resolved Hide resolved

src/bootstrap/src/core/config/config.rs Show resolved Hide resolved

jieyouxu self-assigned this Sep 23, 2025

Zalathar force-pushed the capture branch from f54b28e to d9e5343 Compare September 23, 2025 12:09

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 27, 2025

Zalathar force-pushed the capture branch from d9e5343 to d3bcd57 Compare September 28, 2025 05:19

Zalathar mentioned this pull request Sep 28, 2025

Rename rust.use-lld to rust.bootstrap-override-lld #147046

Merged

Zalathar added 5 commits September 28, 2025 17:18

Fix change-tracker entry for 147046

cc7bd29

Remove old-output-capture from compiletest

e99364e

Add a bootstrap snapshot test for x test compiletest

7b8ae74

Build and test compiletest as a stage0 bootstrap tool

193f717

tool_check_step! no longer needs a builder to determine mode

8b18798

Zalathar force-pushed the capture branch from d3bcd57 to 8b18798 Compare September 28, 2025 07:18

jieyouxu added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Sep 29, 2025

jieyouxu approved these changes Sep 29, 2025

View reviewed changes

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 29, 2025

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 29, 2025

Zalathar mentioned this pull request Sep 29, 2025

Rollup of 7 pull requests #147140

Merged

bors merged commit 3ea1bab into rust-lang:master Sep 29, 2025
10 checks passed

rustbot added this to the 1.92.0 milestone Sep 29, 2025

Zalathar deleted the capture branch September 29, 2025 08:53

Kobzol mentioned this pull request Sep 30, 2025

Remove usage of compiletest-use-stage0-libtest from CI #147188

Merged

Zalathar mentioned this pull request Nov 15, 2025

test-float-parse is a staged test, not a tool #148959

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

compiletest: Remove old-output-capture and become a stage0 bootstrap tool#146929

compiletest: Remove old-output-capture and become a stage0 bootstrap tool#146929
bors merged 5 commits intorust-lang:masterfrom
Zalathar:capture

Zalathar commented Sep 23, 2025 •

edited by rustbot

Loading

Uh oh!

rustbot commented Sep 23, 2025

Uh oh!

Kobzol left a comment •

edited by rustbot

Loading

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Sep 23, 2025

Uh oh!

jieyouxu commented Sep 27, 2025

Uh oh!

bors commented Sep 28, 2025

Uh oh!

rustbot commented Sep 28, 2025

Uh oh!

jieyouxu left a comment •

edited by rustbot

Loading

Uh oh!

jieyouxu commented Sep 29, 2025

Uh oh!

bors commented Sep 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

Zalathar commented Sep 23, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 23, 2025

Uh oh!

Kobzol left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Sep 23, 2025

Uh oh!

jieyouxu commented Sep 27, 2025

Uh oh!

bors commented Sep 28, 2025

Uh oh!

rustbot commented Sep 28, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Sep 29, 2025

Uh oh!

bors commented Sep 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Zalathar commented Sep 23, 2025 •

edited by rustbot

Loading

Kobzol left a comment •

edited by rustbot

Loading

jieyouxu left a comment •

edited by rustbot

Loading