change config.toml to bootstrap.toml #137081

Shourya742 · 2025-02-15T15:15:25Z

Currently, both Bootstrap and Cargo uses same name as their configuration file, which can be confusing. This PR is based on a discussion to rename config.toml to bootstrap.toml for Bootstrap. Closes: #126875.

I have split the PR into atomic commits to make it easier to review. Once the changes are finalized, I will squash them. I am particularly concerned about the changes made to modules that are not part of Bootstrap. How should we handle those changes? Should we ping the respective maintainers?

rustbot · 2025-02-15T15:15:35Z

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

rustbot · 2025-02-15T15:15:51Z

Failed to set assignee to onur: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

Shourya742 · 2025-02-15T15:16:41Z

r? @onur-ozkan

rustbot · 2025-02-15T17:47:51Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred in src/tools/compiletest

cc @jieyouxu

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

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

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

Some changes occurred in src/doc/rustc/src/platform-support

cc @Noratrieb

This PR modifies src/bootstrap/defaults.

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

Some changes occurred in src/doc/unstable-book/src/compiler-flags/control-flow-guard.md

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/opt-dist

cc @Kobzol

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol

Some changes occurred in match checking

cc @Nadrieril

cuviper · 2025-02-15T17:52:43Z

This looks like a rebase gone wild? You might try git rebase -i origin/master and delete everything except your own commits. (Replace origin with whatever you have pointing to rust-lang/rust, if that's different.)

compiler/rustc_codegen_gcc/.github/workflows/ci.yml

onur-ozkan · 2025-03-01T08:54:13Z

p.s.: I already see every update on PRs I am assigned to, you don't need to tag me explicitly.

Shourya742 · 2025-03-01T10:50:24Z

p.s.: I already see every update on PRs I am assigned to, you don't need to tag me explicitly.

oh! I didn't knew that thanks for mentioning..

…g.toml-to-bootstrap.toml, r=onur-ozkan change config.toml to bootstrap.toml Currently, both Bootstrap and Cargo uses same name as their configuration file, which can be confusing. This PR is based on a discussion to rename `config.toml` to `bootstrap.toml` for Bootstrap. Closes: rust-lang#126875. I have split the PR into atomic commits to make it easier to review. Once the changes are finalized, I will squash them. I am particularly concerned about the changes made to modules that are not part of Bootstrap. How should we handle those changes? Should we ping the respective maintainers?

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#136922 (Pattern types: Avoid having to handle an Option for range ends in the type system or the HIR) - rust-lang#137081 (change config.toml to bootstrap.toml) - rust-lang#137103 ({json|html}docck: catch and error on deprecated syntax) - rust-lang#137632 (rustdoc: when merging target features, keep the highest stability) - rust-lang#137684 (Add rustdoc support for `--emit=dep-info[=path]`) - rust-lang#137794 (make qnx pass a test) - rust-lang#137801 (tests: Unignore target modifier tests on all platforms) - rust-lang#137826 (test(codegen): add looping_over_ne_bytes test for rust-lang#133528) Failed merges: - rust-lang#137147 (Add exclude to config.toml) r? `@ghost` `@rustbot` modify labels: rollup

…g.toml-to-bootstrap.toml, r=onur-ozkan change config.toml to bootstrap.toml Currently, both Bootstrap and Cargo uses same name as their configuration file, which can be confusing. This PR is based on a discussion to rename `config.toml` to `bootstrap.toml` for Bootstrap. Closes: rust-lang#126875. I have split the PR into atomic commits to make it easier to review. Once the changes are finalized, I will squash them. I am particularly concerned about the changes made to modules that are not part of Bootstrap. How should we handle those changes? Should we ping the respective maintainers?

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#137081 (change config.toml to bootstrap.toml) - rust-lang#137103 ({json|html}docck: catch and error on deprecated syntax) - rust-lang#137632 (rustdoc: when merging target features, keep the highest stability) - rust-lang#137684 (Add rustdoc support for `--emit=dep-info[=path]`) - rust-lang#137794 (make qnx pass a test) - rust-lang#137801 (tests: Unignore target modifier tests on all platforms) - rust-lang#137826 (test(codegen): add looping_over_ne_bytes test for rust-lang#133528) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2025-03-02T22:47:29Z

@bors r-
breaks bootstrap tests #137884 (comment)

bors · 2025-03-05T19:14:37Z

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

…run-make

Shourya742 · 2025-03-09T11:34:53Z

@rustbot review

onur-ozkan · 2025-03-10T06:09:20Z

@bors r+ rollup

bors · 2025-03-10T06:09:22Z

📌 Commit 1be6f63 has been approved by onur-ozkan

It is now in the queue for this repository.

rustbot assigned Mark-Simulacrum Feb 15, 2025

rustbot assigned onur-ozkan and unassigned Mark-Simulacrum Feb 15, 2025

This comment has been minimized.

Sign in to view

Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch from 044bdca to 58f42a6 Compare February 15, 2025 15:49

Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch 2 times, most recently from 39f2c36 to e4506e0 Compare February 15, 2025 17:47

antoyo reviewed Feb 15, 2025

View reviewed changes

compiler/rustc_codegen_gcc/.github/workflows/ci.yml Outdated Show resolved Hide resolved

Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch 2 times, most recently from 3c592fd to 6b86aae Compare February 16, 2025 02:00

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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2025

matthiaskrgr mentioned this pull request Mar 1, 2025

Rollup of 9 pull requests #137856

Closed

matthiaskrgr mentioned this pull request Mar 2, 2025

Rollup of 8 pull requests #137884

Closed

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 Mar 2, 2025

moxian mentioned this pull request Mar 6, 2025

Leave a breadcrumb towards bootstrap config documentation in bootstrap.toml #138080

Draft

Shourya742 added 6 commits March 8, 2025 10:19

change config.toml to bootstrap.toml for bootstrap module

e8fdf24

replace config.toml to bootstrap.toml in src:doc:rustc-dev-guide

24fa250

replace config.toml to bootstrap.toml in src:doc:rustc

a0dcb31

replace config.toml to bootstrap.toml in src:doc:unstable-book

b006283

replace config.toml to bootstrap.toml in src:tools

b951425

replace config.toml to bootstrap.toml in src/ci, src/etc/* and tests/…

c245b43

…run-make

Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch from c04bc3c to c245b43 Compare March 8, 2025 04:50

make profile_user_dist test backward compatible

1be6f63

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 Mar 9, 2025

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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

change config.toml to bootstrap.toml #137081

change config.toml to bootstrap.toml #137081

Shourya742 commented Feb 15, 2025 •

edited

Loading

rustbot commented Feb 15, 2025

rustbot commented Feb 15, 2025

Shourya742 commented Feb 15, 2025

This comment has been minimized.

rustbot commented Feb 15, 2025

cuviper commented Feb 15, 2025

onur-ozkan commented Mar 1, 2025

Shourya742 commented Mar 1, 2025

matthiaskrgr commented Mar 2, 2025 •

edited

Loading

bors commented Mar 5, 2025

Shourya742 commented Mar 9, 2025

onur-ozkan commented Mar 10, 2025

bors commented Mar 10, 2025

change config.toml to bootstrap.toml #137081

Are you sure you want to change the base?

change config.toml to bootstrap.toml #137081

Conversation

Shourya742 commented Feb 15, 2025 • edited Loading

rustbot commented Feb 15, 2025

rustbot commented Feb 15, 2025

Shourya742 commented Feb 15, 2025

This comment has been minimized.

rustbot commented Feb 15, 2025

cuviper commented Feb 15, 2025

onur-ozkan commented Mar 1, 2025

Shourya742 commented Mar 1, 2025

matthiaskrgr commented Mar 2, 2025 • edited Loading

bors commented Mar 5, 2025

Shourya742 commented Mar 9, 2025

onur-ozkan commented Mar 10, 2025

bors commented Mar 10, 2025

Shourya742 commented Feb 15, 2025 •

edited

Loading

matthiaskrgr commented Mar 2, 2025 •

edited

Loading