Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 6, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe83d4
Rename bootstrap/defaults/{config.toml.PROFILE => config.PROFILE.toml}
thomcc Oct 5, 2020
5388eb4
Add changelog entry mentioning the renamed profile files
thomcc Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/bootstrap/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
0 src/bootstrap/defaults/config.toml.codegen → src/bootstrap/defaults/config.codegen.toml
View file
Open in desktop
File renamed without changes.
0 src/bootstrap/defaults/config.toml.compiler → src/bootstrap/defaults/config.compiler.toml
View file
Open in desktop
File renamed without changes.
0 src/bootstrap/defaults/config.toml.library → src/bootstrap/defaults/config.library.toml
View file
Open in desktop
File renamed without changes.
0 src/bootstrap/defaults/config.toml.user → src/bootstrap/defaults/config.user.toml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/bootstrap/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand All @@ -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 {
Expand Down