Streamline config in bootstrap #144807

Shourya742 · 2025-08-02T06:13:52Z

This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit.

r? @Kobzol

…te functions

rustbot · 2025-08-02T06:13:58Z

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

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

Kobzol

Oh, GH doesn't send notifications for PRs being marked as ready to review, annoying as always. Found one thing.

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

Kobzol · 2025-08-06T06:42:57Z

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

@@ -977,11 +1163,90 @@ impl Config {
            config.channel = channel;


This override is applied after config.channel has already been read.. but it seems to be pre-existing, not sure if it was intended though. Let's leave it like it is for now.

Kobzol · 2025-08-06T10:58:25Z

Thanks, looks good now. You can r=me once CI is green.

@bors delegate+

bors · 2025-08-06T10:58:28Z

✌️ @Shourya742, you can now approve this pull request!

If @Kobzol told you to "r=me" after making some further change, please make that change, then do @bors r=@Kobzol

Shourya742 · 2025-08-06T11:38:12Z

@bors r=@Kobzol

bors · 2025-08-06T11:38:15Z

📌 Commit 962836d has been approved by Kobzol

It is now in the queue for this repository.

…onfig, r=Kobzol Streamline config in bootstrap This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit. r? `@Kobzol`

…onfig, r=Kobzol Streamline config in bootstrap This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit. r? ``@Kobzol``

…onfig, r=Kobzol Streamline config in bootstrap This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit. r? ```@Kobzol```

Rollup of 20 pull requests Successful merges: - #137831 (Tweak auto trait errors) - #143028 (emit `StorageLive` and schedule `StorageDead` for `let`-`else`'s bindings after matching) - #143764 (lower pattern bindings in the order they're written and base drop order on primary bindings' order) - #143808 (Port `#[should_panic]` to the new attribute parsing infrastructure ) - #143906 (Miri: non-deterministic floating point operations in `foreign_items`) - #143929 (Mark all deprecation lints in name resolution as deny-by-default and report-in-deps) - #144133 (Stabilize const TypeId::of) - #144439 (Introduce ModernIdent type to unify macro 2.0 hygiene handling) - #144473 (Address libunwind.a inconsistency issues in the bootstrap program) - #144659 (bootstrap: refactor mingw dist and fix gnullvm) - #144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled) - #144807 (Streamline config in bootstrap) - #144900 (Stabilize `unsigned_signed_diff` feature) - #144903 (Rename `begin_panic_handler` to `panic_handler`) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - #144974 (compiler-builtins subtree update) - #144997 (bump bootstrap compiler to 1.90 beta) - #145004 (Couple of minor cleanups) - #145009 (A couple small changes for rust-analyzer next-solver work) - #145014 (Revert "Preserve the .debug_gdb_scripts section") r? `@ghost` `@rustbot` modify labels: rollup

…onfig, r=Kobzol Streamline config in bootstrap This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit. r? ````@Kobzol````

Rollup of 19 pull requests Successful merges: - #144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - #144764 ([codegen] assume the tag, not the relative discriminant) - #144807 (Streamline config in bootstrap) - #144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - #144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - #144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - #144914 (Add support for `ty::Instance` path shortening in diagnostics) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - #144999 (coverage: Remove all unstable support for MC/DC instrumentation) - #145009 (A couple small changes for rust-analyzer next-solver work) - #145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - #145042 (stdarch subtree update) - #145047 (move `type_check` out of `compute_regions`) - #145051 (Prevent name collisions with internal implementation details) - #145053 (Add a lot of NLL `known-bug` tests) - #145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - #145057 (Clean up some resolved test regressions of const trait removals in std) - #145068 (Readd myself to review queue) - #145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144807 - Shourya742:2025-07-30-streamline-config, r=Kobzol Streamline config in bootstrap This PR restructures the config module to improve readability and debuggability. It also aims to eliminate as many invariants as possible. Best reviewed commit by commit. r? `````@Kobzol`````

Rollup of 19 pull requests Successful merges: - rust-lang/rust#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang/rust#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang/rust#144807 (Streamline config in bootstrap) - rust-lang/rust#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang/rust#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang/rust#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang/rust#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang/rust#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang/rust#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang/rust#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang/rust#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang/rust#145042 (stdarch subtree update) - rust-lang/rust#145047 (move `type_check` out of `compute_regions`) - rust-lang/rust#145051 (Prevent name collisions with internal implementation details) - rust-lang/rust#145053 (Add a lot of NLL `known-bug` tests) - rust-lang/rust#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang/rust#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang/rust#145068 (Readd myself to review queue) - rust-lang/rust#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 19 pull requests Successful merges: - rust-lang#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang#144807 (Streamline config in bootstrap) - rust-lang#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang#145042 (stdarch subtree update) - rust-lang#145047 (move `type_check` out of `compute_regions`) - rust-lang#145051 (Prevent name collisions with internal implementation details) - rust-lang#145053 (Add a lot of NLL `known-bug` tests) - rust-lang#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang#145068 (Readd myself to review queue) - rust-lang#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 19 pull requests Successful merges: - rust-lang/rust#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang/rust#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang/rust#144807 (Streamline config in bootstrap) - rust-lang/rust#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang/rust#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang/rust#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang/rust#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang/rust#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang/rust#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang/rust#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang/rust#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang/rust#145042 (stdarch subtree update) - rust-lang/rust#145047 (move `type_check` out of `compute_regions`) - rust-lang/rust#145051 (Prevent name collisions with internal implementation details) - rust-lang/rust#145053 (Add a lot of NLL `known-bug` tests) - rust-lang/rust#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang/rust#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang/rust#145068 (Readd myself to review queue) - rust-lang/rust#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Shourya742 added 26 commits August 1, 2025 20:26

move gcc config parsing to parse_inner

f95edbe

move dist to parse_inner

3f9bf57

move target parsing to parse_inner

924912c

move install to parse_inner

89219ff

move llvm parsing to parse_inner

3248ff1

move rust config to parse_inner

ddd2a54

Force initializing ExecutionContext with verbosity and fail_fast mode

ae05591

Extract TOML config loading and src directory computation into separa…

82756fd

…te functions

Split TOML postprocessing into a separate function

f89ea08

Override some build TOML values by flags

cfc40de

Fix logging of config skip values

8652d96

Fix verbosity setting

58a38cd

add install default implementation

222dfcc

add gcc and dist default implementation

bbe7c08

add llvm default implementation

38ddefa

add rust default implementation

8b80cb0

make llvm toml fields follow a specific naming convention

d3d3b10

make gcc toml fields follow a specific naming convention

c008a4b

make dist toml fields follow a specific naming convention

4d2a2c2

make install toml fields follow a specific naming convention

ad98550

make build toml fields follow a specific naming convention

2c96132

move build config to the top of parse method

a75326b

move install config to the top of parse method

39d9cf7

move rust config to the top of parse method

120d93e

move llvm config to the top of parse method

f74f1a0

move dist and gcc config to the top of parse method

7f20ad8

rustbot assigned Kobzol Aug 2, 2025

rustbot added 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 Aug 2, 2025

Shourya742 force-pushed the 2025-07-30-streamline-config branch from 888edc0 to a2794f9 Compare August 4, 2025 18:38

Shourya742 marked this pull request as ready for review August 5, 2025 05:45

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 5, 2025

Kobzol reviewed Aug 6, 2025

View reviewed changes

remove redundant _toml suffix and other misc changes

962836d

Shourya742 force-pushed the 2025-07-30-streamline-config branch from a2794f9 to 962836d Compare August 6, 2025 10:21

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 Aug 6, 2025

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 21 pull requests #145034

Closed

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 20 pull requests #145039

Closed

Zalathar mentioned this pull request Aug 8, 2025

Rollup of 19 pull requests #145077

Merged

bors merged commit af33da3 into rust-lang:master Aug 8, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Streamline config in bootstrap #144807

Streamline config in bootstrap #144807

Uh oh!

Shourya742 commented Aug 2, 2025

Uh oh!

rustbot commented Aug 2, 2025

Uh oh!

Kobzol left a comment

Uh oh!

Uh oh!

Kobzol Aug 6, 2025

Uh oh!

Kobzol commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

Shourya742 commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

Uh oh!

Uh oh!

		@@ -977,11 +1163,90 @@ impl Config {
		config.channel = channel;

Streamline config in bootstrap #144807

Streamline config in bootstrap #144807

Uh oh!

Conversation

Shourya742 commented Aug 2, 2025

Uh oh!

rustbot commented Aug 2, 2025

Uh oh!

Kobzol left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Kobzol Aug 6, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

Shourya742 commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

Uh oh!

Uh oh!