Rename `rust.use-lld` to `rust.bootstrap-override-lld` by Kobzol · Pull Request #147046 · rust-lang/rust

Kobzol · 2025-09-25T21:02:19Z

First part of #146640. The old option is kept for backwards compatibility, we can remove it in ~6 months, as usually.

I'm not sure if the bootstrap prefix is ideal, after all we have a bunch of other configs that only affect bootstrap's behavior and not the built artifacts. Maybe build.override-lld? But I don't think it matters that much, as long as it's clear that it is an override, and how does it differ from rust.lld.

r? @jieyouxu

rustbot · 2025-09-25T21:02:22Z

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

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

This PR modifies bootstrap.example.toml.

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

rustbot · 2025-09-25T21:02:24Z

jieyouxu is currently at their maximum review capacity.
They may take a while to respond.

jieyouxu

Looks good, I'm on board with the naming. Feel free to r=me after fixing the tidy failure.

View changes since this review

jieyouxu · 2025-09-26T00:52:38Z

@rustbot author

Kobzol · 2025-09-26T08:55:54Z

@bors r=jieyouxu rollup

bors · 2025-09-26T08:55:58Z

📌 Commit 0374fc5 has been approved by jieyouxu

It is now in the queue for this repository.

Rename `rust.use-lld` to `rust.bootstrap-override-lld` First part of rust-lang#146640. The old option is kept for backwards compatibility, we can remove it in ~6 months, as usually. I'm not sure if the bootstrap prefix is ideal, after all we have a bunch of other configs that only affect bootstrap's behavior and not the built artifacts. Maybe `build.override-lld`? But I don't think it matters that much, as long as it's clear that it is an override, and how does it differ from `rust.lld`. r? `@jieyouxu`

Rollup of 7 pull requests Successful merges: - #145113 (resolve: Do not finalize shadowed bindings) - #146523 (Demote both armebv7r-none-* targets.) - #146778 (Use standard attribute logic for allocator shim) - #147016 (fix doc comments to be more standard) - #147027 (Add new `tyalias` intra-doc link disambiguator) - #147031 (mbe: Simplify check_redundant_vis_repetition) - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup

Rename `rust.use-lld` to `rust.bootstrap-override-lld` First part of rust-lang#146640. The old option is kept for backwards compatibility, we can remove it in ~6 months, as usually. I'm not sure if the bootstrap prefix is ideal, after all we have a bunch of other configs that only affect bootstrap's behavior and not the built artifacts. Maybe `build.override-lld`? But I don't think it matters that much, as long as it's clear that it is an override, and how does it differ from `rust.lld`. r? ``@jieyouxu``

Rename `rust.use-lld` to `rust.bootstrap-override-lld` First part of rust-lang#146640. The old option is kept for backwards compatibility, we can remove it in ~6 months, as usually. I'm not sure if the bootstrap prefix is ideal, after all we have a bunch of other configs that only affect bootstrap's behavior and not the built artifacts. Maybe `build.override-lld`? But I don't think it matters that much, as long as it's clear that it is an override, and how does it differ from `rust.lld`. r? ```@jieyouxu```

bors · 2025-09-26T17:32:41Z

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

rustbot · 2025-09-26T18:21:28Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Kobzol · 2025-09-26T18:24:17Z

Rebased.

@bors r=jieyouxu

bors · 2025-09-26T18:24:20Z

📌 Commit 852aa20 has been approved by jieyouxu

It is now in the queue for this repository.

Rollup of 10 pull requests Successful merges: - #145113 (resolve: Do not finalize shadowed bindings) - #146523 (Demote both armebv7r-none-* targets.) - #146704 (port `#[debugger_visualizer]` to the new attribute system) - #146758 (Stop linking rs{begin,end} objects on x86_64-*-windows-gnu) - #146778 (Use standard attribute logic for allocator shim) - #146849 (Reduce some uses of `LegacyBang`) - #147016 (fix doc comments to be more standard) - #147027 (Add new `tyalias` intra-doc link disambiguator) - #147031 (mbe: Simplify check_redundant_vis_repetition) - #147058 (Ignore more failing ui tests for GCC backend) Failed merges: - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup

Rename `rust.use-lld` to `rust.bootstrap-override-lld` First part of rust-lang#146640. The old option is kept for backwards compatibility, we can remove it in ~6 months, as usually. I'm not sure if the bootstrap prefix is ideal, after all we have a bunch of other configs that only affect bootstrap's behavior and not the built artifacts. Maybe `build.override-lld`? But I don't think it matters that much, as long as it's clear that it is an override, and how does it differ from `rust.lld`. r? `@jieyouxu`

Rollup of 9 pull requests Successful merges: - #140482 (std::net: update tcp deferaccept delay type to Duration.) - #146037 (Introduce CoerceShared lang item and trait, and basic Reborrow tests) - #146732 (tests: relax expectations after llvm change 902ddda120a5) - #147018 (re-order normalizations in run-make linker-warning test) - #147032 (Fix doctest compilation time display) - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) - #147050 (PassWrapper: update for new PGOOptions args in LLVM 22) - #147075 (Make `def_path_hash_to_def_id` not panic when passed an invalid hash) - #147076 (update issue number for more_float_constants) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - #146037 (Introduce CoerceShared lang item and trait, and basic Reborrow tests) - #146732 (tests: relax expectations after llvm change 902ddda120a5) - #147018 (re-order normalizations in run-make linker-warning test) - #147032 (Fix doctest compilation time display) - #147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) - #147050 (PassWrapper: update for new PGOOptions args in LLVM 22) - #147075 (Make `def_path_hash_to_def_id` not panic when passed an invalid hash) - #147076 (update issue number for more_float_constants) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #147046 - Kobzol:bootstrap-ll, r=jieyouxu Rename `rust.use-lld` to `rust.bootstrap-override-lld` First part of #146640. The old option is kept for backwards compatibility, we can remove it in ~6 months, as usually. I'm not sure if the bootstrap prefix is ideal, after all we have a bunch of other configs that only affect bootstrap's behavior and not the built artifacts. Maybe `build.override-lld`? But I don't think it matters that much, as long as it's clear that it is an override, and how does it differ from `rust.lld`. r? ``@jieyouxu``

Zalathar · 2025-09-28T05:19:04Z

src/bootstrap/src/utils/change_tracker.rs

        summary: "New option `build.windows-rc` that will override which resource compiler on Windows will be used to compile Rust.",
    },
+    ChangeInfo {
+        change_id: 99999,


Looks like you accidentally forgot to update this. 😅

🤦 I'll update it the next time we modify the change tracker, to avoid churn. Thanks!

In that case I might as well fix it in #146929, assuming another opportunity doesn’t come up first.

Ok, let's do that please 😇 Thanks!

Rollup of 10 pull requests Successful merges: - rust-lang/rust#145113 (resolve: Do not finalize shadowed bindings) - rust-lang/rust#146523 (Demote both armebv7r-none-* targets.) - rust-lang/rust#146704 (port `#[debugger_visualizer]` to the new attribute system) - rust-lang/rust#146758 (Stop linking rs{begin,end} objects on x86_64-*-windows-gnu) - rust-lang/rust#146778 (Use standard attribute logic for allocator shim) - rust-lang/rust#146849 (Reduce some uses of `LegacyBang`) - rust-lang/rust#147016 (fix doc comments to be more standard) - rust-lang/rust#147027 (Add new `tyalias` intra-doc link disambiguator) - rust-lang/rust#147031 (mbe: Simplify check_redundant_vis_repetition) - rust-lang/rust#147058 (Ignore more failing ui tests for GCC backend) Failed merges: - rust-lang/rust#147046 (Rename `rust.use-lld` to `rust.bootstrap-override-lld`) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned jieyouxu Sep 25, 2025

Kobzol mentioned this pull request Sep 25, 2025

Change how LLD is configured in bootstrap.toml #146640

Closed

2 tasks

This comment has been minimized.

Sign in to view

jieyouxu approved these changes Sep 26, 2025

View reviewed changes

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 Sep 26, 2025

Kobzol force-pushed the bootstrap-ll branch from c7fc0de to 0374fc5 Compare September 26, 2025 08:55

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2025

matthiaskrgr mentioned this pull request Sep 26, 2025

Rollup of 7 pull requests #147059

Closed

matthiaskrgr mentioned this pull request Sep 26, 2025

Rollup of 6 pull requests #147064

Closed

This was referenced Sep 26, 2025

Rollup of 11 pull requests #147073

Closed

Rollup of 10 pull requests #147074

Merged

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 26, 2025

Rename rust.use-lld to rust.bootstrap-override-lld

852aa20

Kobzol force-pushed the bootstrap-ll branch from 0374fc5 to 852aa20 Compare September 26, 2025 18: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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2025

GuillaumeGomez mentioned this pull request Sep 27, 2025

Rollup of 9 pull requests #147087

Closed

matthiaskrgr mentioned this pull request Sep 27, 2025

Rollup of 8 pull requests #147104

Merged

bors merged commit 82dff12 into rust-lang:master Sep 28, 2025
10 checks passed

rustbot added this to the 1.92.0 milestone Sep 28, 2025

Zalathar reviewed Sep 28, 2025

View reviewed changes

Kobzol deleted the bootstrap-ll branch September 28, 2025 06:54

Zalathar mentioned this pull request Oct 20, 2025

bootstrap: fix change_id for rust.lld change #147908

Closed

Uh oh!

Conversation

Kobzol commented Sep 25, 2025

Uh oh!

rustbot commented Sep 25, 2025

Uh oh!

rustbot commented Sep 25, 2025

Uh oh!

This comment has been minimized.

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Sep 26, 2025

Uh oh!

Kobzol commented Sep 26, 2025

Uh oh!

bors commented Sep 26, 2025

Uh oh!

bors commented Sep 26, 2025

Uh oh!

rustbot commented Sep 26, 2025

Uh oh!

Kobzol commented Sep 26, 2025

Uh oh!

bors commented Sep 26, 2025

Uh oh!

Uh oh!

Zalathar Sep 28, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Sep 28, 2025

Choose a reason for hiding this comment

Uh oh!

Zalathar Sep 28, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Sep 28, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jieyouxu left a comment •

edited

Loading