mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-14 02:49:40 +00:00
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
This commit is contained in:
commit
54d72d73e9
@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
## [Non-breaking changes since the last major version]
|
||||
|
||||
- `x.py check` needs opt-in to check tests (--all-targets) [#77473](https://github.com/rust-lang/rust/pull/77473)
|
||||
- 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)
|
||||
|
||||
|
||||
## [Version 2] - 2020-09-25
|
||||
|
||||
|
@ -574,7 +574,7 @@ impl Config {
|
||||
include_path.push("src");
|
||||
include_path.push("bootstrap");
|
||||
include_path.push("defaults");
|
||||
include_path.push(format!("config.toml.{}", include));
|
||||
include_path.push(format!("config.{}.toml", include));
|
||||
let included_toml = get_toml(&include_path);
|
||||
toml.merge(included_toml);
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ pub fn setup(src_path: &Path, include_name: &str) {
|
||||
file.display()
|
||||
);
|
||||
println!(
|
||||
"note: this will use the configuration in {}/src/bootstrap/defaults/config.toml.{}",
|
||||
"note: this will use the configuration in {}/src/bootstrap/defaults/config.{}.toml",
|
||||
src_path.display(),
|
||||
include_name
|
||||
);
|
||||
@ -36,7 +36,7 @@ pub fn setup(src_path: &Path, include_name: &str) {
|
||||
t!(fs::write(path, settings));
|
||||
|
||||
let include_path =
|
||||
format!("{}/src/bootstrap/defaults/config.toml.{}", src_path.display(), include_name);
|
||||
format!("{}/src/bootstrap/defaults/config.{}.toml", src_path.display(), include_name);
|
||||
println!("`x.py` will now use the configuration at {}", include_path);
|
||||
|
||||
let suggestions = match include_name {
|
||||
|
Loading…
Reference in New Issue
Block a user