squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #77298 - jyn514:bootstrap-config, r=Mark-Simulacrum

Browse source 
Don't warn if the config file is somewhere other than `config.toml`

Previously, `config.config` was always hardcoded as `"config.toml"`.
I thought that it was being overridden with the actual value later, but
it turns out `flags.config` was being completely discarded. This keeps
`config.config` in sync with `flags.config`.

Fixes https://github.com/rust-lang/rust/issues/77293
r? `@Mark-Simulacrum`
cc `@davidtwco`
This commit is contained in:
bors 2020-09-30 15:03:09 +00:00
parent 939cc3e445 d537067c97
commit d92d28e523
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/config.rs
View file

@ -513,7 +513,6 @@ impl Config {
config.rust_codegen_backends = vec![INTERNER.intern_str("llvm")];
config.deny_warnings = true;
config.missing_tools = false;
config.config = PathBuf::from("config.toml");
// set by bootstrap.py
config.build = TargetSelection::from_user(&env!("BUILD_TRIPLE"));
@ -556,10 +555,10 @@ impl Config {
#[cfg(test)]
let get_toml = |_| TomlConfig::default();
#[cfg(not(test))]
let get_toml = |file: PathBuf| {
let get_toml = |file: &Path| {
use std::process;
let contents = t!(fs::read_to_string(&file), "`include` config not found");
let contents = t!(fs::read_to_string(file), "`include` config not found");
match toml::from_str(&contents) {
Ok(table) => table,
Err(err) => {
@ -569,18 +568,21 @@ impl Config {
}
};
let mut toml = flags.config.map(get_toml).unwrap_or_else(TomlConfig::default);
let mut toml = flags.config.as_deref().map(get_toml).unwrap_or_else(TomlConfig::default);
if let Some(include) = &toml.profile {
let mut include_path = config.src.clone();
include_path.push("src");
include_path.push("bootstrap");
include_path.push("defaults");
include_path.push(format!("config.toml.{}", include));
let included_toml = get_toml(include_path);
let included_toml = get_toml(&include_path);
toml.merge(included_toml);
}
config.changelog_seen = toml.changelog_seen;
if let Some(cfg) = flags.config {
config.config = cfg;
}
let build = toml.build.unwrap_or_default();