Skip to content

Commit

Permalink
Rollup merge of rust-lang#78550 - jyn514:setup, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
x.py setup: Create config.toml in the current directory, not the top-level directory

See rust-lang#78509 for discussion.

r? @pnkfelix
cc @cuviper @Mark-Simulacrum
  • Loading branch information
m-ou-se authored Oct 31, 2020
2 parents 89aea55 + 8cf7d66 commit c0f356d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down

0 comments on commit c0f356d

Please sign in to comment.