Skip to content

Streamline config in bootstrap #144807

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
Draft
wants to merge 35 commits into
base: master
Choose a base branch
from
Draft

Streamline config in bootstrap #144807

wants to merge 35 commits into from
+1,672 −1,156

Conversation

Shourya742
Copy link
Contributor

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

Shourya742 added 30 commits August 1, 2025 20:26
@Shourya742
move gcc config parsing to parse_inner
f95edbe
@Shourya742
move dist to parse_inner
3f9bf57
@Shourya742
move target parsing to parse_inner
924912c
@Shourya742
move install to parse_inner
89219ff
@Shourya742
move llvm parsing to parse_inner
3248ff1
@Shourya742
move rust config to parse_inner
ddd2a54
@Shourya742
Force initializing ExecutionContext with verbosity and fail_fast mode
ae05591
@Shourya742
Extract TOML config loading and src directory computation into separa…
82756fd 
…te functions
@Shourya742
Split TOML postprocessing into a separate function
f89ea08
@Shourya742
Override some build TOML values by flags
cfc40de
@Shourya742
Fix logging of config skip values
8652d96
@Shourya742
Fix verbosity setting
58a38cd
@Shourya742
add install default implementation
222dfcc
@Shourya742
add gcc and dist default implementation
bbe7c08
@Shourya742
add llvm default implementation
38ddefa
@Shourya742
add rust default implementation
8b80cb0
@Shourya742
make llvm toml fields follow a specific naming convention
d3d3b10
@Shourya742
make gcc toml fields follow a specific naming convention
c008a4b
@Shourya742
make dist toml fields follow a specific naming convention
4d2a2c2
@Shourya742
make install toml fields follow a specific naming convention
ad98550
@Shourya742
make build toml fields follow a specific naming convention
2c96132
@Shourya742
move build config to the top of parse method
a75326b
@Shourya742
move install config to the top of parse method
39d9cf7
@Shourya742
move rust config to the top of parse method
120d93e
@Shourya742
move llvm config to the top of parse method
f74f1a0
@Shourya742
move dist and gcc config to the top of parse method
7f20ad8
@Shourya742
port all io methods to not use config
eb81f72
@Shourya742
make mutation agnostic of cmd and stage
263a91c
@Shourya742
move all mutation section to one part and assignment section to one part
c7b34bc
@Shourya742
make the initialized part more structured
4d161e5
@rustbot 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
@rustbot
Copy link
Collaborator

rustbot commented Aug 2, 2025

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

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

@Shourya742 Shourya742 marked this pull request as draft August 2, 2025 06:14
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 2, 2025
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu-llvm-19-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
test core::builder::tests::any_debug ... ok
error: test failed, to rerun pass `--lib`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/aarch64-unknown-linux-gnu/debug/deps/bootstrap-7672b2362469c319 --test-threads=1 -Z unstable-options --format json` (exit status: 1)
note: test exited abnormally; to see the full output pass --nocapture to the harness.
Build completed unsuccessfully in 0:01:17
  local time: Sat Aug  2 07:03:16 UTC 2025
  network time: Sat, 02 Aug 2025 07:03:17 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

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
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Shourya742 @rustbot @rust-log-analyzer @Kobzol