bootstrap: Move several items out of the crate root by Zalathar · Pull Request #161157 · rust-lang/rust

Zalathar · 2026-08-16T07:09:48Z

Prior to bulk-moving everything out of the crate root, this PR moves several individual items to more suitable modules.

There should be no change to bootstrap behaviour.

This seems to be the module that relies on them the most, and other modules already pull in things from `dist`.

rustbot · 2026-08-16T07:09:51Z

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

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

rustbot · 2026-08-16T07:09:53Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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, jieyouxu

Kobzol · 2026-08-16T07:44:27Z

You can r=me once PR CI is green.

r? me

fbstj · 2026-08-16T08:40:44Z

+/// corresponds to the platform the compiler runs on. This structure is used as
+/// a parameter to many methods below.


'below' no longer makes sense?

View changes since the review

It already doesn’t make much sense as-is, so dropping the sentence entirely is probably wise.

Zalathar · 2026-08-16T10:11:42Z

PR CI is green. I'll push a trivial fix for the comment, then approve.

The destination is `crate::core::builder::cargo`, the new name is `prepare_shims_dump_dir`, and the adjustment is to take `&Builder<'_>` instead of `&Build`.

Zalathar · 2026-08-16T10:13:09Z

@bors r=Kobzol

rust-bors · 2026-08-16T10:13:12Z

📌 Commit d5a8464 has been approved by Kobzol

It is now in the queue for this repository.

bootstrap: Move several items out of the crate root Prior to bulk-moving everything out of the crate root, this PR moves several individual items to more suitable modules. There should be no change to bootstrap behaviour.

Rollup of 12 pull requests Successful merges: - #160529 (Upgrade and deduplicate dependencies) - #161017 (Library: enforce clippy deref lints in CI) - #156674 (bootstrap: add bootstrap step to run stdarch-gen checks in CI) - #161006 ([CI] Build newer `binutils` before building `gcc`) - #161141 (Add documentation for BPF targets) - #161157 (bootstrap: Move several items out of the crate root) - #161053 (Add regression test for borrow of array drop type in const) - #161073 (Add regression test for path printing with infinitely many visible names) - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation) - #161146 (Switch to c8a EC2 runner for auto merges) - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore)) - #161150 (add crashtests [4/N])

bootstrap: Move several items out of the crate root Prior to bulk-moving everything out of the crate root, this PR moves several individual items to more suitable modules. There should be no change to bootstrap behaviour.

…uwer Rollup of 12 pull requests Successful merges: - #160529 (Upgrade and deduplicate dependencies) - #161017 (Library: enforce clippy deref lints in CI) - #156674 (bootstrap: add bootstrap step to run stdarch-gen checks in CI) - #161006 ([CI] Build newer `binutils` before building `gcc`) - #161141 (Add documentation for BPF targets) - #161157 (bootstrap: Move several items out of the crate root) - #161053 (Add regression test for borrow of array drop type in const) - #161073 (Add regression test for path printing with infinitely many visible names) - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation) - #161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`) - #161146 (Switch to c8a EC2 runner for auto merges) - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore))

bootstrap: Move several items out of the crate root Prior to bulk-moving everything out of the crate root, this PR moves several individual items to more suitable modules. There should be no change to bootstrap behaviour.

…uwer Rollup of 17 pull requests Successful merges: - #160529 (Upgrade and deduplicate dependencies) - #161017 (Library: enforce clippy deref lints in CI) - #160416 (std: fix unix socket address truncation without a trailing NUL) - #161006 ([CI] Build newer `binutils` before building `gcc`) - #161141 (Add documentation for BPF targets) - #161157 (bootstrap: Move several items out of the crate root) - #161185 (std: guard against unwinds in queue-based `Once`) - #161186 (miri subtree update) - #159855 (std: retry waitid on EINTR in the pidfd wait path) - #161053 (Add regression test for borrow of array drop type in const) - #161073 (Add regression test for path printing with infinitely many visible names) - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation) - #161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`) - #161136 (Add BPF test for Rust ABI stack arguments) - #161146 (Switch to c8a EC2 runner for auto merges) - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore)) - #161181 (Add back flaky gui rustdoc test `tests/rustdoc-gui/headers-color.goml`)

bootstrap: Move several items out of the crate root Prior to bulk-moving everything out of the crate root, this PR moves several individual items to more suitable modules. There should be no change to bootstrap behaviour.

…uwer Rollup of 17 pull requests Successful merges: - #161017 (Library: enforce clippy deref lints in CI) - #160416 (std: fix unix socket address truncation without a trailing NUL) - #161006 ([CI] Build newer `binutils` before building `gcc`) - #161141 (Add documentation for BPF targets) - #161157 (bootstrap: Move several items out of the crate root) - #161185 (std: guard against unwinds in queue-based `Once`) - #161186 (miri subtree update) - #159855 (std: retry waitid on EINTR in the pidfd wait path) - #160478 (diagnostics: Suggest fn binding type for unstable closure for<> binders) - #161053 (Add regression test for borrow of array drop type in const) - #161073 (Add regression test for path printing with infinitely many visible names) - #161099 (Add regression test for unstable def_ident_span fingerprint with incremental recompilation) - #161103 (cleanup: rip out unnecessary `iter().last()` and `iter().next()`) - #161136 (Add BPF test for Rust ABI stack arguments) - #161146 (Switch to c8a EC2 runner for auto merges) - #161148 ([rustdoc] Put back one removed flaky GUI test (which hopefully isn't flaky anymore)) - #161181 (Add back flaky gui rustdoc test `tests/rustdoc-gui/headers-color.goml`)

Zalathar added 2 commits August 16, 2026 14:46

Move LLVM_TOOLS and LLD_FILE_NAMES into build_steps::dist

f955803

This seems to be the module that relies on them the most, and other modules already pull in things from `dist`.

Move EXTRA_CHECK_CFGS into crate::core::builder::cargo

73960bf

rustbot assigned Mark-Simulacrum Aug 16, 2026

This comment was marked as resolved.

Sign in to view

Zalathar force-pushed the bootstrap-root branch 2 times, most recently from 6993a01 to 96150c2 Compare August 16, 2026 07:38

rustbot assigned Kobzol and unassigned Mark-Simulacrum Aug 16, 2026

Zalathar force-pushed the bootstrap-root branch from 96150c2 to e511419 Compare August 16, 2026 07:50

fbstj reviewed Aug 16, 2026

View reviewed changes

Zalathar added 6 commits August 16, 2026 20:12

Move Compiler to its own module crate::core::compiler

9612357

Move CodegenBackendKind to its own module crate::core::backend

38c260e

Move TestTarget into build_steps::test

9ff48b2

Move Crate into crate::core::metadata

57033a0

Move envify into crate::utils::helpers and add a test

af768f6

Move/rename/adjust prepare_behaviour_dump_dir

d5a8464

The destination is `crate::core::builder::cargo`, the new name is `prepare_shims_dump_dir`, and the adjustment is to take `&Builder<'_>` instead of `&Build`.

Zalathar force-pushed the bootstrap-root branch from e511419 to d5a8464 Compare August 16, 2026 10:12

rust-bors Bot 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 16, 2026

JonathanBrouwer mentioned this pull request Aug 16, 2026

Rollup of 6 pull requests #161169

Closed

GuillaumeGomez mentioned this pull request Aug 16, 2026

Rollup of 12 pull requests #161175

Closed

JonathanBrouwer mentioned this pull request Aug 16, 2026

Rollup of 12 pull requests #161179

Closed

JonathanBrouwer mentioned this pull request Aug 16, 2026

Rollup of 17 pull requests #161188

Closed

JonathanBrouwer mentioned this pull request Aug 16, 2026

Rollup of 16 pull requests #161189

Closed

JonathanBrouwer mentioned this pull request Aug 16, 2026

Rollup of 17 pull requests #161196

Open

Navigation Menu

Uh oh!

Uh oh!

bootstrap: Move several items out of the crate root - #161157

bootstrap: Move several items out of the crate root#161157
Zalathar wants to merge 8 commits into
rust-lang:mainfrom
Zalathar:bootstrap-root

Zalathar commented Aug 16, 2026

Uh oh!

rustbot commented Aug 16, 2026

Uh oh!

rustbot commented Aug 16, 2026

Uh oh!

This comment was marked as resolved.

Kobzol commented Aug 16, 2026

Uh oh!

fbstj Aug 16, 2026 •

edited by rustbot

Loading

Uh oh!

Zalathar Aug 16, 2026

Uh oh!

Zalathar commented Aug 16, 2026

Uh oh!

Zalathar commented Aug 16, 2026

Uh oh!

rust-bors Bot commented Aug 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		/// corresponds to the platform the compiler runs on. This structure is used as
		/// a parameter to many methods below.

Uh oh!

Uh oh!

Conversation

Zalathar commented Aug 16, 2026

Uh oh!

rustbot commented Aug 16, 2026

Uh oh!

rustbot commented Aug 16, 2026

Uh oh!

This comment was marked as resolved.

Kobzol commented Aug 16, 2026

Uh oh!

fbstj Aug 16, 2026 • 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!

Zalathar Aug 16, 2026

Choose a reason for hiding this comment

Uh oh!

Zalathar commented Aug 16, 2026

Uh oh!

Zalathar commented Aug 16, 2026

Uh oh!

rust-bors Bot commented Aug 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fbstj Aug 16, 2026 •

edited by rustbot

Loading