Skip to content

Commit 7351fd4

Browse files
committed
Auto merge of #137081 - Shourya742:2025-02-15-change-config.toml-to-bootstrap.toml, r=onur-ozkan,jieyouxu,kobzol
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/rust#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?
2 parents cba258d + b660b49 commit 7351fd4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ MIRI_LOG=rustc_mir::interpret=info,miri::stacked_borrows ./miri run tests/pass/v
153153

154154
Note that you will only get `info`, `warn` or `error` messages if you use a prebuilt compiler.
155155
In order to get `debug` and `trace` level messages, you need to build miri with a locally built
156-
compiler that has `debug=true` set in `config.toml`.
156+
compiler that has `debug=true` set in `bootstrap.toml`.
157157

158158
#### Debugging error messages
159159

cargo-miri/src/setup.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub fn setup(
115115
// https://github.com/rust-lang/miri/issues/1421,
116116
// https://github.com/rust-lang/miri/issues/2429). Looks like setting
117117
// `RUSTC_WRAPPER` to the empty string overwrites `build.rustc-wrapper` set via
118-
// `config.toml`.
118+
// `bootstrap.toml`.
119119
command.env("RUSTC_WRAPPER", "");
120120

121121
if show_setup {

0 commit comments

Comments
 (0)