Rollup merge of #78550 - jyn514:setup, r=Mark-Simulacrum

m-ou-se · web-flow · commit c0f356d28fb2 · 2020-10-31T09:49:36.000+01:00
x.py setup: Create config.toml in the current directory, not the top-level directory See #78509 for discussion. r? @pnkfelix cc @cuviper @Mark-Simulacrum
diff --git 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\

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ pub fn setup(src_path: &Path, profile: Profile) {`
`89`	`89`	`std::process::exit(1);`
`90`	`90`	`}`
`91`	`91`
`92`		`- let path = cfg_file.unwrap_or_else(\|\| src_path.join("config.toml"));`
	`92`	`+ let path = cfg_file.unwrap_or("config.toml".into());`
`93`	`93`	`let settings = format!(`
`94`	`94`	`"# Includes one of the default files in src/bootstrap/defaults\n\`
`95`	`95`	`profile = \"{}\"\n\`