about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2020-10-29 21:23:55 -0400
committerJoshua Nelson <jyn514@gmail.com>2020-10-29 21:23:55 -0400
commit8cf7d66d0a7e5405f55887ca008cca7fce7f7396 (patch)
tree0a2a8392203000fa070d654d15051a702034c2f4
parenta3d7a5e94507e3d6618790187bd85250ced82c4f (diff)
downloadrust-8cf7d66d0a7e5405f55887ca008cca7fce7f7396.tar.gz
rust-8cf7d66d0a7e5405f55887ca008cca7fce7f7396.zip
Create config.toml in the current directory, not the top-level directory
See https://github.com/rust-lang/rust/issues/78509 for discussion.
-rw-r--r--src/bootstrap/setup.rs2
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\