Skip to content

Commit 54d72d7

Browse files
authored
Rollup merge of #77558 - thomcc:defaults-toml-extension, r=jyn514
Rename bootstrap/defaults/{config.toml.PROFILE => config.PROFILE.toml} This allows these files to have okay syntax highlighting in editors, and helps avoid nagging from editors which want to suggest that I install a plugin for `*.library` files to view the `config.toml.library` or whatever. It's a very minor change. r?@jyn514
2 parents 2b5049b + 5388eb4 commit 54d72d7

7 files changed

+5
-3
lines changed

src/bootstrap/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
77
## [Non-breaking changes since the last major version]
88

99
- `x.py check` needs opt-in to check tests (--all-targets) [#77473](https://github.com/rust-lang/rust/pull/77473)
10+
- The default bootstrap profiles are now located at `bootstrap/defaults/config.$PROFILE.toml` (previously they were located at `bootstrap/defaults/config.toml.$PROFILE`) [#77558](https://github.com/rust-lang/rust/pull/77558)
11+
1012

1113
## [Version 2] - 2020-09-25
1214

src/bootstrap/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ impl Config {
574574
include_path.push("src");
575575
include_path.push("bootstrap");
576576
include_path.push("defaults");
577-
include_path.push(format!("config.toml.{}", include));
577+
include_path.push(format!("config.{}.toml", include));
578578
let included_toml = get_toml(&include_path);
579579
toml.merge(included_toml);
580580
}

src/bootstrap/setup.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn setup(src_path: &Path, include_name: &str) {
2020
file.display()
2121
);
2222
println!(
23-
"note: this will use the configuration in {}/src/bootstrap/defaults/config.toml.{}",
23+
"note: this will use the configuration in {}/src/bootstrap/defaults/config.{}.toml",
2424
src_path.display(),
2525
include_name
2626
);
@@ -36,7 +36,7 @@ pub fn setup(src_path: &Path, include_name: &str) {
3636
t!(fs::write(path, settings));
3737

3838
let include_path =
39-
format!("{}/src/bootstrap/defaults/config.toml.{}", src_path.display(), include_name);
39+
format!("{}/src/bootstrap/defaults/config.{}.toml", src_path.display(), include_name);
4040
println!("`x.py` will now use the configuration at {}", include_path);
4141

4242
let suggestions = match include_name {

0 commit comments

Comments
 (0)