nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 15:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename bootstrap/defaults/{config.toml.PROFILE => config.PROFILE.toml}

Browse Source
This commit is contained in:
Thom Chiovoloni 2020-10-04 18:35:16 -07:00
parent beb5ae474d
commit afe83d4c1c
6 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/config.rs
View File

@ -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);
}

0
src/bootstrap/defaults/config.toml.codegen → src/bootstrap/defaults/config.codegen.toml
View File

0
src/bootstrap/defaults/config.toml.compiler → src/bootstrap/defaults/config.compiler.toml
View File

0
src/bootstrap/defaults/config.toml.library → src/bootstrap/defaults/config.library.toml
View File

0
src/bootstrap/defaults/config.toml.user → src/bootstrap/defaults/config.user.toml
View File

4
src/bootstrap/setup.rs
View File

@ -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 {