Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change config.toml to bootstrap.toml #137081

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Feb 15, 2025

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
Copy link
Collaborator

rustbot commented Feb 15, 2025

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
Copy link
Collaborator

rustbot commented Feb 15, 2025

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
Copy link
Contributor Author

r? @onur-ozkan

@rust-log-analyzer

This comment has been minimized.

@Shourya742 Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch from 044bdca to 58f42a6 Compare February 15, 2025 15:49
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc O-solid Operating System: SOLID O-windows Operating system: Windows PG-exploit-mitigations Project group: Exploit mitigations T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Feb 15, 2025
@Shourya742 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
@rustbot
Copy link
Collaborator

rustbot commented Feb 15, 2025

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
Copy link
Member

cuviper commented Feb 15, 2025

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.)

@Shourya742 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
@Nadrieril Nadrieril removed O-solid Operating System: SOLID A-testsuite Area: The testsuite used to check the correctness of rustc A-rustc-dev-guide Area: rustc-dev-guide A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 16, 2025
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bootstrap changes seems good to me

@Shourya742 Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch from 6b86aae to 2f99cbf Compare February 16, 2025 14:51
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Feb 16, 2025
@Shourya742 Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch from 2f99cbf to 7aeea28 Compare February 16, 2025 14:53
@bors
Copy link
Contributor

bors commented Feb 18, 2025

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

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 18, 2025
@Shourya742 Shourya742 force-pushed the 2025-02-15-change-config.toml-to-bootstrap.toml branch from 7aeea28 to 9e9ad4f Compare February 19, 2025 02:50
@bors
Copy link
Contributor

bors commented Feb 21, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rename config.toml to bootstrap.toml
10 participants