diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2020-10-31 09:49:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 09:49:36 +0100 |
| commit | c0f356d28fb2ea1712ee3b5b8cd4918933e3860e (patch) | |
| tree | ae138ca3c21fdea1c63ce2cc41134ca9f1bb28f4 | |
| parent | 89aea55a7d479f0f0ea89a81436237d78454ece9 (diff) | |
| parent | 8cf7d66d0a7e5405f55887ca008cca7fce7f7396 (diff) | |
| download | rust-c0f356d28fb2ea1712ee3b5b8cd4918933e3860e.tar.gz rust-c0f356d28fb2ea1712ee3b5b8cd4918933e3860e.zip | |
Rollup merge of #78550 - jyn514:setup, r=Mark-Simulacrum
x.py setup: Create config.toml in the current directory, not the top-level directory See https://github.com/rust-lang/rust/issues/78509 for discussion. r? @pnkfelix cc @cuviper @Mark-Simulacrum
| -rw-r--r-- | src/bootstrap/setup.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index c6e1c99564c..f5ce45a5bd1 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -89,7 +89,7 @@ pub fn setup(src_path: &Path, profile: Profile) { std::process::exit(1); } - let path = cfg_file.unwrap_or_else(|| src_path.join("config.toml")); + let path = cfg_file.unwrap_or("config.toml".into()); let settings = format!( "# Includes one of the default files in src/bootstrap/defaults\n\ profile = \"{}\"\n\ |