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
This commit is contained in:
commit
c0f356d28f
|
@ -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\
|
||||
|
|
Loading…
Reference in a new issue