bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Only set config.config to None when using default path

Browse source
This commit is contained in:
Tanner Davies 2022-11-07 15:27:42 -07:00
parent 13d4c61b5f
commit 66e8a29640
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/config.rs
View file

@ -926,8 +926,10 @@ impl Config {
// Give a hard error if `--config` or `RUST_BOOTSTRAP_CONFIG` are set to a missing path,
// but not if `config.toml` hasn't been created.
let mut toml = if !using_default_path || toml_path.exists() {
config.config = Some(toml_path.clone());
get_toml(&toml_path)
} else {
config.config = None;
TomlConfig::default()
};
@ -942,7 +944,6 @@ impl Config {
}
config.changelog_seen = toml.changelog_seen;
config.config = if toml_path.exists() { Some(toml_path) } else { None };
let build = toml.build.unwrap_or_default();