bootstrap: Handle dotted table keys when parsing bootstrap.toml by Dnreikronos · Pull Request #157335 · rust-lang/rust

Dnreikronos · 2026-06-02T20:47:22Z

bootstrap.py has a small hand-rolled reader that pulls the stage0 cargo and rustc out of bootstrap.toml before the real TOML parser is built. It only understood [table] headers, so the dotted form that bootstrap.example.toml now uses (build.cargo = "...") was silently dropped, and the cargo/rustc lookup matched those keys in any table rather than only [build].

Teach the reader to strip an optional dotted prefix and treat it as the key's table, the same way configure.py does when it writes the file, and scope the cargo/rustc lookup to [build]. New tests cover the dotted form, equivalence with the section form, wrong-table rejection, and dotted target keys.

Disclosure: the code was written by AI (Claude); reviewed and tested by me.

rustbot · 2026-06-02T20:47:27Z

r? @clubby789

rustbot has assigned @clubby789.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: bootstrap
bootstrap expanded to 6 candidates
Random selection from Mark-Simulacrum, clubby789

clubby789

I notice you've been using LLMs to make a lot of contributions quickly; I'd suggest slowing down and doing some more careful review to avoid saturating our capacity. For future LLM changes, we'd appreciate coming to Zulip to discuss them in advance

View changes since this review

rustbot · 2026-06-03T15:45:24Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

Dnreikronos · 2026-06-03T16:04:15Z

I notice you've been using LLMs to make a lot of contributions quickly; I'd suggest slowing down and doing some more careful review to avoid saturating our capacity. For future LLM changes, we'd appreciate coming to Zulip to discuss them in advance
View changes since this review

Ofc, thanks for sending me the Zulip URL.
I will definitely invest more time on the issues to don't saturate the capacity of the team.
I just have one question...does you guys(maintainers) are using LLM?

clubby789 · 2026-06-03T19:42:48Z

does you guys(maintainers) are using LLM?

I can't speak for everyone, but generally not for generating code that is intended to be merged

clubby789 · 2026-06-03T20:34:40Z

r=me with comment addressed

theemathas · 2026-06-04T02:33:44Z

For reference, here's a draft of what might become the project's policy on LLMs: https://github.com/jyn514/rust-forge/blob/llm-policy/src/policies/llm-usage.md

Dnreikronos · 2026-06-04T13:47:05Z

For reference, here's a draft of what might become the project's policy on LLMs: https://github.com/jyn514/rust-forge/blob/llm-policy/src/policies/llm-usage.md

Thanks for sending this, I will definitely look into to learn the good practices of the project about LLMs.
I'm currently using a lot to understand the codebase and where I have to make the code changes, because the project it's gigantic and I'm pretty new on the project itself.
I definitely don't use to make comments on PRs/issues because even using LLMs I like to understand everything that is happening, for the only thing that I use LLMs on the comments are to fix my typos because I'm not an English native.
But thanks, again, for sending me this.

Dnreikronos · 2026-06-04T14:26:20Z

@rustbot ready

Dnreikronos · 2026-06-05T18:16:19Z

r=me with comment addressed

Addressed the changes you requested on the last review in the commit hash 7227a5b, so I believe that everything should be handled right now.
Thanks for your time invested and for pairing with me on this problem 🙃

clubby789 · 2026-06-07T08:54:17Z

Can you squash your commits?

The hand-written reader bootstrap.py uses to find the stage0 cargo and rustc only recognized `[table]` headers, so dotted keys like `build.cargo = "..."` were ignored. Parse the dotted prefix on each key as the table it belongs to, resolved relative to the enclosing section, and scope the cargo/rustc lookup to `[build]` so the Python and Rust sides agree.

Dnreikronos · 2026-06-07T14:24:28Z

Can you squash your commits?

Ofc!
Just did!

clubby789 · 2026-06-09T10:27:37Z

@bors r+

rust-bors · 2026-06-09T10:27:41Z

📌 Commit a127448 has been approved by clubby789

It is now in the queue for this repository.

…keys, r=clubby789 bootstrap: Handle dotted table keys when parsing bootstrap.toml Fixesrust-lang#156948 `bootstrap.py` has a small hand-rolled reader that pulls the stage0 cargo and rustc out of `bootstrap.toml` before the real TOML parser is built. It only understood `[table]` headers, so the dotted form that `bootstrap.example.toml` now uses (`build.cargo = "..."`) was silently dropped, and the cargo/rustc lookup matched those keys in any table rather than only `[build]`. Teach the reader to strip an optional dotted prefix and treat it as the key's table, the same way `configure.py` does when it writes the file, and scope the cargo/rustc lookup to `[build]`. New tests cover the dotted form, equivalence with the section form, wrong-table rejection, and dotted target keys. *Disclosure: the code was written by AI (Claude); reviewed and tested by me.*

Rollup of 10 pull requests Successful merges: - #157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml) - #157503 (Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check) - #148183 (rustdoc: Test & document `test_harness` code block attribute) - #156067 (Fix async drop glue for Box<T>) - #156399 (fix improper ctypes in Znext solver) - #157410 (Implement rustc_public::CrateDef{,Type} for FieldDef) - #157605 (Arg splat experiment - syntax impl) - #157630 (Add multibyte JSON diagnostic regression test) - #157633 (Reorder `impl` restriction rendering and add bottom margin) - #157642 (Report duplicate relaxed bounds during ast lowering)

…keys, r=clubby789 bootstrap: Handle dotted table keys when parsing bootstrap.toml Fixesrust-lang#156948 `bootstrap.py` has a small hand-rolled reader that pulls the stage0 cargo and rustc out of `bootstrap.toml` before the real TOML parser is built. It only understood `[table]` headers, so the dotted form that `bootstrap.example.toml` now uses (`build.cargo = "..."`) was silently dropped, and the cargo/rustc lookup matched those keys in any table rather than only `[build]`. Teach the reader to strip an optional dotted prefix and treat it as the key's table, the same way `configure.py` does when it writes the file, and scope the cargo/rustc lookup to `[build]`. New tests cover the dotted form, equivalence with the section form, wrong-table rejection, and dotted target keys. *Disclosure: the code was written by AI (Claude); reviewed and tested by me.*

Rollup of 18 pull requests Successful merges: - #152852 (Remove driver_lint_caps) - #157166 (Change type of async context parameter after state transform.) - #157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml) - #157503 (Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check) - #157571 (Remove ProcMacro enum from proc macro ABI) - #148183 (rustdoc: Test & document `test_harness` code block attribute) - #153847 (Fix marker trait winnowing depending on impl order) - #156067 (Fix async drop glue for Box<T>) - #156399 (fix improper ctypes in Znext solver) - #157338 (Make `Literal::byte_character_value` work with bytes as well) - #157410 (Implement rustc_public::CrateDef{,Type} for FieldDef) - #157605 (Arg splat experiment - syntax impl) - #157630 (Add multibyte JSON diagnostic regression test) - #157633 (Reorder `impl` restriction rendering and add bottom margin) - #157642 (Report duplicate relaxed bounds during ast lowering) - #157652 (fix doc for unicode normalization faq on `casefold` APIs) - #157661 (Update to ar_archive_writer v0.5.2) - #157668 (Add test for matches in `rustc_must_match_exhaustively`) Failed merges: - #157670 (Rename `errors.rs` file to `diagnostics.rs` (4/N))

Rollup of 17 pull requests Successful merges: - #157166 (Change type of async context parameter after state transform.) - #157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml) - #157503 (Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check) - #157571 (Remove ProcMacro enum from proc macro ABI) - #148183 (rustdoc: Test & document `test_harness` code block attribute) - #153847 (Fix marker trait winnowing depending on impl order) - #156067 (Fix async drop glue for Box<T>) - #156399 (fix improper ctypes in Znext solver) - #157338 (Make `Literal::byte_character_value` work with bytes as well) - #157410 (Implement rustc_public::CrateDef{,Type} for FieldDef) - #157605 (Arg splat experiment - syntax impl) - #157630 (Add multibyte JSON diagnostic regression test) - #157633 (Reorder `impl` restriction rendering and add bottom margin) - #157642 (Report duplicate relaxed bounds during ast lowering) - #157652 (fix doc for unicode normalization faq on `casefold` APIs) - #157661 (Update to ar_archive_writer v0.5.2) - #157668 (Add test for matches in `rustc_must_match_exhaustively`) Failed merges: - #157670 (Rename `errors.rs` file to `diagnostics.rs` (4/N))

Rollup merge of #157335 - Dnreikronos:bootstrap/dotted_toml_keys, r=clubby789 bootstrap: Handle dotted table keys when parsing bootstrap.toml Fixes#156948 `bootstrap.py` has a small hand-rolled reader that pulls the stage0 cargo and rustc out of `bootstrap.toml` before the real TOML parser is built. It only understood `[table]` headers, so the dotted form that `bootstrap.example.toml` now uses (`build.cargo = "..."`) was silently dropped, and the cargo/rustc lookup matched those keys in any table rather than only `[build]`. Teach the reader to strip an optional dotted prefix and treat it as the key's table, the same way `configure.py` does when it writes the file, and scope the cargo/rustc lookup to `[build]`. New tests cover the dotted form, equivalence with the section form, wrong-table rejection, and dotted target keys. *Disclosure: the code was written by AI (Claude); reviewed and tested by me.*

Rollup of 17 pull requests Successful merges: - rust-lang/rust#157166 (Change type of async context parameter after state transform.) - rust-lang/rust#157335 (bootstrap: Handle dotted table keys when parsing bootstrap.toml) - rust-lang/rust#157503 (Disable `tests/debuginfo/pretty-std.rs` `OsString` cdb check) - rust-lang/rust#157571 (Remove ProcMacro enum from proc macro ABI) - rust-lang/rust#148183 (rustdoc: Test & document `test_harness` code block attribute) - rust-lang/rust#153847 (Fix marker trait winnowing depending on impl order) - rust-lang/rust#156067 (Fix async drop glue for Box<T>) - rust-lang/rust#156399 (fix improper ctypes in Znext solver) - rust-lang/rust#157338 (Make `Literal::byte_character_value` work with bytes as well) - rust-lang/rust#157410 (Implement rustc_public::CrateDef{,Type} for FieldDef) - rust-lang/rust#157605 (Arg splat experiment - syntax impl) - rust-lang/rust#157630 (Add multibyte JSON diagnostic regression test) - rust-lang/rust#157633 (Reorder `impl` restriction rendering and add bottom margin) - rust-lang/rust#157642 (Report duplicate relaxed bounds during ast lowering) - rust-lang/rust#157652 (fix doc for unicode normalization faq on `casefold` APIs) - rust-lang/rust#157661 (Update to ar_archive_writer v0.5.2) - rust-lang/rust#157668 (Add test for matches in `rustc_must_match_exhaustively`) Failed merges: - rust-lang/rust#157670 (Rename `errors.rs` file to `diagnostics.rs` (4/N))

rustbot assigned clubby789 Jun 2, 2026

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 Jun 2, 2026

clubby789 requested changes Jun 3, 2026
View reviewed changes

Comment threadsrc/bootstrap/bootstrap.py Outdated

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 Jun 3, 2026

clubby789 reviewed Jun 3, 2026
View reviewed changes

Comment threadsrc/bootstrap/bootstrap.py Outdated

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 Jun 4, 2026

Dnreikronos force-pushed the bootstrap/dotted_toml_keys branch from 7227a5b to 6168e25Compare June 7, 2026 14:14

Dnreikronos force-pushed the bootstrap/dotted_toml_keys branch from 6168e25 to a127448Compare June 7, 2026 14:23

rust-borsBot 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 Jun 9, 2026

GuillaumeGomez mentioned this pull request Jun 9, 2026
Rollup of 10 pull requests #157663
Closed

GuillaumeGomez mentioned this pull request Jun 9, 2026
Rollup of 15 pull requests #157673
Closed

jhpratt mentioned this pull request Jun 9, 2026
Rollup of 18 pull requests #157679
Closed

jhpratt mentioned this pull request Jun 9, 2026
Rollup of 17 pull requests #157683
Merged

rust-borsBot merged commit d591a32 into rust-lang:mainJun 10, 2026
12 checks passed

rustbot added this to the 1.98.0 milestone Jun 10, 2026

Uh oh!

Uh oh!

Conversation

Dnreikronos commented Jun 2, 2026• edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 2, 2026

Uh oh!

clubby789 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!

rustbot commented Jun 3, 2026

Uh oh!

Dnreikronos commented Jun 3, 2026

Uh oh!

clubby789 commented Jun 3, 2026

Uh oh!

Uh oh!

clubby789 commented Jun 3, 2026

Uh oh!

theemathas commented Jun 4, 2026

Uh oh!

Dnreikronos commented Jun 4, 2026

Uh oh!

Dnreikronos commented Jun 4, 2026

Uh oh!

Dnreikronos commented Jun 5, 2026

Uh oh!

clubby789 commented Jun 7, 2026

Uh oh!

Dnreikronos commented Jun 7, 2026

Uh oh!

clubby789 commented Jun 9, 2026

Uh oh!

rust-borsBot commented Jun 9, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Dnreikronos commented Jun 2, 2026•
edited by rustbot
Loading

clubby789 left a comment •
edited by rustbot
Loading