OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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
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.rust_codegen_backends = vec![INTERNER.intern_str("llvm")];
config.deny_warnings = true; config.deny_warnings = true;
config.missing_tools = false; config.missing_tools = false;
config.config = PathBuf::from("config.toml");
// set by bootstrap.py // set by bootstrap.py
config.build = TargetSelection::from_user(&env!("BUILD_TRIPLE")); config.build = TargetSelection::from_user(&env!("BUILD_TRIPLE"));
@ -556,10 +555,10 @@ impl Config {
#[cfg(test)] #[cfg(test)]
let get_toml = |_| TomlConfig::default(); let get_toml = |_| TomlConfig::default();
#[cfg(not(test))] #[cfg(not(test))]
let get_toml = |file: PathBuf| { let get_toml = |file: &Path| {
use std::process; 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) { match toml::from_str(&contents) {
Ok(table) => table, Ok(table) => table,
Err(err) => { 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 { if let Some(include) = &toml.profile {
let mut include_path = config.src.clone(); let mut include_path = config.src.clone();
include_path.push("src"); include_path.push("src");
include_path.push("bootstrap"); include_path.push("bootstrap");
include_path.push("defaults"); include_path.push("defaults");
include_path.push(format!("config.toml.{}", include)); 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); toml.merge(included_toml);
} }
config.changelog_seen = toml.changelog_seen; config.changelog_seen = toml.changelog_seen;
if let Some(cfg) = flags.config {
config.config = cfg;
}
let build = toml.build.unwrap_or_default(); let build = toml.build.unwrap_or_default();