Skip to content

Commit fdedc38

Browse files
committed
replace config.toml to bootstrap.toml in src:tools
1 parent 3224917 commit fdedc38

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

src/tools/compiletest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn main() {
2727
eprintln!(
2828
r#"
2929
WARNING: profiler runtime is not available, so `.coverage` files won't be {actioned}
30-
help: try setting `profiler = true` in the `[build]` section of `config.toml`"#
30+
help: try setting `profiler = true` in the `[build]` section of `bootstrap.toml`"#
3131
);
3232
}
3333

src/tools/miri/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

src/tools/miri/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 {

src/tools/opt-dist/src/main.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,17 @@ fn main() -> anyhow::Result<()> {
369369
println!("Environment values\n{}", format_env_variables());
370370
});
371371

372-
with_log_group("Printing config.toml", || {
373-
if let Ok(config) = std::fs::read_to_string("config.toml") {
374-
println!("Contents of `config.toml`:\n{config}");
372+
with_log_group("Printing bootstrap.toml", || {
373+
let config_file = if std::path::Path::new("bootstrap.toml").exists() {
374+
"bootstrap.toml"
375+
} else {
376+
"config.toml" // Fall back for backward compatibility
377+
};
378+
379+
if let Ok(config) = std::fs::read_to_string(config_file) {
380+
println!("Contents of `bootstrap.toml`:\n{config}");
381+
} else {
382+
eprintln!("Failed to read `{}`", config_file);
375383
}
376384
});
377385

src/tools/opt-dist/src/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ llvm-config = "{llvm_config}"
8383
cargo = cargo_path.to_string().replace('\\', "/"),
8484
llvm_config = llvm_config.to_string().replace('\\', "/")
8585
);
86-
log::info!("Using following `config.toml` for running tests:\n{config_content}");
86+
log::info!("Using following `bootstrap.toml` for running tests:\n{config_content}");
8787

8888
// Simulate a stage 0 compiler with the extracted optimized dist artifacts.
89-
std::fs::write("config.toml", config_content)?;
89+
std::fs::write("bootstrap.toml", config_content)?;
9090

9191
let x_py = env.checkout_path().join("x.py");
9292
let mut args = vec![

src/tools/rustdoc-gui-test/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn get_browser_ui_test_version_inner(npm: &Path, global: bool) -> Option<String>
2020
Err(e) => {
2121
eprintln!(
2222
"path to npm can be wrong, provided path: {npm:?}. Try to set npm path \
23-
in config.toml in [build.npm]",
23+
in bootstrap.toml in [build.npm]",
2424
);
2525
panic!("{:?}", e)
2626
}

0 commit comments

Comments
 (0)