diff options
| author | Thom Chiovoloni <chiovolonit@gmail.com> | 2020-10-04 18:35:16 -0700 |
|---|---|---|
| committer | Thom Chiovoloni <chiovolonit@gmail.com> | 2020-10-04 18:35:16 -0700 |
| commit | afe83d4c1ca70149b463ac7548cf5d204d3d5844 (patch) | |
| tree | 52f2570b2f20ea41172fbaaefc93942bdad55677 | |
| parent | beb5ae474d2835962ebdf7416bd1c9ad864fe101 (diff) | |
| download | rust-afe83d4c1ca70149b463ac7548cf5d204d3d5844.tar.gz rust-afe83d4c1ca70149b463ac7548cf5d204d3d5844.zip | |
Rename bootstrap/defaults/{config.toml.PROFILE => config.PROFILE.toml}
| -rw-r--r-- | src/bootstrap/config.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.codegen.toml (renamed from src/bootstrap/defaults/config.toml.codegen) | 0 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.compiler.toml (renamed from src/bootstrap/defaults/config.toml.compiler) | 0 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.library.toml (renamed from src/bootstrap/defaults/config.toml.library) | 0 | ||||
| -rw-r--r-- | src/bootstrap/defaults/config.user.toml (renamed from src/bootstrap/defaults/config.toml.user) | 0 | ||||
| -rw-r--r-- | src/bootstrap/setup.rs | 4 |
6 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 5314398ce9a..6265bbaf5c2 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -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); } diff --git a/src/bootstrap/defaults/config.toml.codegen b/src/bootstrap/defaults/config.codegen.toml index a9505922ca7..a9505922ca7 100644 --- a/src/bootstrap/defaults/config.toml.codegen +++ b/src/bootstrap/defaults/config.codegen.toml diff --git a/src/bootstrap/defaults/config.toml.compiler b/src/bootstrap/defaults/config.compiler.toml index 4772de8a2cb..4772de8a2cb 100644 --- a/src/bootstrap/defaults/config.toml.compiler +++ b/src/bootstrap/defaults/config.compiler.toml diff --git a/src/bootstrap/defaults/config.toml.library b/src/bootstrap/defaults/config.library.toml index e4316f4d864..e4316f4d864 100644 --- a/src/bootstrap/defaults/config.toml.library +++ b/src/bootstrap/defaults/config.library.toml diff --git a/src/bootstrap/defaults/config.toml.user b/src/bootstrap/defaults/config.user.toml index 6647061d88f..6647061d88f 100644 --- a/src/bootstrap/defaults/config.toml.user +++ b/src/bootstrap/defaults/config.user.toml diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index 9d3a889aa00..8a77641fbfe 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -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 { |