Skip to content

Conversation

@Kobzol
Copy link
Member

@Kobzol Kobzol commented Jan 9, 2026

This makes it easier to understand which artifacts will be stored in the build stamp. Should help with #145343.

Before, there were two booleans (keep .rmeta files and a special mode for rustc). I created an explicit enum for it instead. The mapping is:

  • (false, false) => ArtifactKeepMode::OnlyRlib
  • (true, false) => ArtifactKeepMode::OnlyRmeta (used for check/clippy builds)
  • (false, true) => special rustc mode

r? @bjorn3

@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 Jan 9, 2026
@Kobzol Kobzol force-pushed the bootstrap-refactor-build-outputs branch from 380a9e5 to 47f28fc Compare January 9, 2026 14:11
@bjorn3
Copy link
Member

bjorn3 commented Jan 9, 2026

@bors r+

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 9, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 9, 2026

📌 Commit 47f28fc has been approved by bjorn3

It is now in the queue for this repository.

@rust-bors rust-bors bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 9, 2026
rust-bors bot added a commit that referenced this pull request Jan 10, 2026
Rollup of 11 pull requests

Successful merges:

 - #150269 (Remove inactive nvptx maintainer)
 - #150713 (mgca: Type-check fields of struct expr const args)
 - #150765 (rustc_parse_format: improve error for missing `:` before `?` in format args)
 - #150847 (Fix broken documentation links to SipHash)
 - #150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`)
 - #150872 (Fix some loop block coercion diagnostics)
 - #150874 (Ignore `rustc-src-gpl` in fast try builds)
 - #150875 (Refactor artifact keep mode in bootstrap)
 - #150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`)
 - #150882 (Supress unused_parens lint for guard patterns)
 - #150884 (Update bors email in CI postprocessing step)

Failed merges:

 - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple)

r? @ghost
rust-bors bot added a commit that referenced this pull request Jan 10, 2026
Rollup of 11 pull requests

Successful merges:

 - #150269 (Remove inactive nvptx maintainer)
 - #150713 (mgca: Type-check fields of struct expr const args)
 - #150765 (rustc_parse_format: improve error for missing `:` before `?` in format args)
 - #150847 (Fix broken documentation links to SipHash)
 - #150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`)
 - #150872 (Fix some loop block coercion diagnostics)
 - #150874 (Ignore `rustc-src-gpl` in fast try builds)
 - #150875 (Refactor artifact keep mode in bootstrap)
 - #150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`)
 - #150882 (Supress unused_parens lint for guard patterns)
 - #150884 (Update bors email in CI postprocessing step)

Failed merges:

 - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple)

r? @ghost
@rust-bors rust-bors bot merged commit 980e6ad into rust-lang:main Jan 11, 2026
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 11, 2026
rust-timer added a commit that referenced this pull request Jan 11, 2026
Rollup merge of #150875 - bootstrap-refactor-build-outputs, r=bjorn3

Refactor artifact keep mode in bootstrap

This makes it easier to understand which artifacts will be stored in the build stamp. Should help with #145343.

Before, there were two booleans (keep .rmeta files and a special mode for rustc). I created an explicit enum for it instead. The mapping is:
- `(false, false)` => `ArtifactKeepMode::OnlyRlib`
- `(true, false)` => `ArtifactKeepMode::OnlyRmeta` (used for check/clippy builds)
- `(false, true)` => special rustc mode

r? @bjorn3
@Kobzol Kobzol deleted the bootstrap-refactor-build-outputs branch January 11, 2026 07:39
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jan 12, 2026
Rollup of 11 pull requests

Successful merges:

 - rust-lang/rust#150269 (Remove inactive nvptx maintainer)
 - rust-lang/rust#150713 (mgca: Type-check fields of struct expr const args)
 - rust-lang/rust#150765 (rustc_parse_format: improve error for missing `:` before `?` in format args)
 - rust-lang/rust#150847 (Fix broken documentation links to SipHash)
 - rust-lang/rust#150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`)
 - rust-lang/rust#150872 (Fix some loop block coercion diagnostics)
 - rust-lang/rust#150874 (Ignore `rustc-src-gpl` in fast try builds)
 - rust-lang/rust#150875 (Refactor artifact keep mode in bootstrap)
 - rust-lang/rust#150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`)
 - rust-lang/rust#150882 (Supress unused_parens lint for guard patterns)
 - rust-lang/rust#150884 (Update bors email in CI postprocessing step)

Failed merges:

 - rust-lang/rust#150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple)

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Development

Successfully merging this pull request may close these issues.

3 participants