Skip to content

Commit

Permalink
Only set config.config to None when using default path
Browse files Browse the repository at this point in the history
  • Loading branch information
ted-tanner committed Nov 7, 2022
1 parent 13d4c61 commit 66e8a29
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/bootstrap/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};

Expand All @@ -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();

Expand Down

0 comments on commit 66e8a29

Please sign in to comment.