Skip to content

Streamline config parsing method#144301

Closed
Shourya742 wants to merge 2 commits intorust-lang:masterfrom
Shourya742:2025-06-22-move-build-toml-parsing-to-build-config
Closed

Streamline config parsing method#144301
Shourya742 wants to merge 2 commits intorust-lang:masterfrom
Shourya742:2025-06-22-move-build-toml-parsing-to-build-config

Conversation

@Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Jul 22, 2025 •
edited by rustbot
Loading

This PR should be merged after: #144126 (as this PR contains few of it commits )

This PR streamlines the parse_inner function of the config:

  1. It moves the TOML build-specific parsing logic to apply_build_config, aligning with how other TOML section-specific modules are structured.
  2. Currently, the config fields in parse_inner must be initialized in a specific order effectively following a DAG. This PR maintains that ordering (which we plan to change later), but the new structure makes the initialization order clearer and easier to follow.
  3. Methods are being moved into their respective modules to better localize their scope and reduce cross-module dependencies.

r? @Kobzol

@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 Jul 22, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2025

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

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Shourya742 Shourya742 force-pushed the 2025-06-22-move-build-toml-parsing-to-build-config branch from e1a4d2a to db3b43d Compare July 22, 2025 12:28
@Kobzol
Copy link
Member

Kobzol commented Jul 22, 2025

Can be rebased now.

@bors
Copy link
Collaborator

bors commented Jul 22, 2025

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

@Shourya742
This PR includes the following changes:
24b495d 
1. Moves TOML build parsing into a separate module.
2. Corrects the ordering of `apply_*_config` method calls.
3. Moves download logic specific to `toml_config` into its own module.
4. Updates tests to align with the correct behavior.
@Shourya742
move llvm_enzyme out of rust config, so that llvm_config initializati…
121be5a 
…on is preferred
@Shourya742 Shourya742 force-pushed the 2025-06-22-move-build-toml-parsing-to-build-config branch from db3b43d to 121be5a Compare July 22, 2025 17:06
@Kobzol
Copy link
Member

Kobzol commented Jul 22, 2025

I went through this and seeing how the code is structured now helped me realize some issues with how we currently parse Config. I did some experiments based on your branch and I'd like to propose a slightly different structuring here. We can discuss it during our next call.

@bors
Copy link
Collaborator

bors commented Jul 23, 2025

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

@Kobzol
Copy link
Member

Kobzol commented Jul 28, 2025

@rustbot blocked On refactoring download methods.

@rustbot 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 Jul 28, 2025
@Shourya742
Copy link
Contributor Author

Shourya742 commented Jul 30, 2025

Closing this up, and starting fresh, lots of conflicts to resolve otherwise.

@Shourya742 Shourya742 closed this Jul 30, 2025
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-blocked Status: Blocked on something else such as an RFC or other implementation work. 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.

5 participants

@Shourya742 @rustbot @rust-log-analyzer @Kobzol @bors