Skip to content

Commit c882838

Browse files
committed
use Config::get_builder_toml for ci-rustc config parsing
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 0ad00dd commit c882838

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,18 +2346,15 @@ impl Config {
23462346
self.download_ci_rustc(commit);
23472347

23482348
if let Some(config_path) = &self.config {
2349-
let builder_config_path =
2350-
self.out.join(self.build.triple).join("ci-rustc").join(BUILDER_CONFIG_FILENAME);
2351-
2352-
let ci_config_toml = match Self::get_toml(&builder_config_path) {
2349+
let ci_config_toml = match self.get_builder_toml("ci-rustc") {
23532350
Ok(ci_config_toml) => ci_config_toml,
23542351
Err(e) if e.to_string().contains("unknown field") => {
23552352
println!("WARNING: CI rustc has some fields that are no longer supported in bootstrap; download-rustc will be disabled.");
23562353
println!("HELP: Consider rebasing to a newer commit if available.");
23572354
return None;
23582355
},
23592356
Err(e) => {
2360-
eprintln!("ERROR: Failed to parse CI rustc config at '{}': {e}", builder_config_path.display());
2357+
eprintln!("ERROR: Failed to parse CI rustc config.toml: {e}");
23612358
exit!(2);
23622359
},
23632360
};
@@ -2823,6 +2820,7 @@ impl Config {
28232820

28242821
/// Compares the current `Llvm` options against those in the CI LLVM builder and detects any incompatible options.
28252822
/// It does this by destructuring the `Llvm` instance to make sure every `Llvm` field is covered and not missing.
2823+
#[cfg(not(test))]
28262824
pub(crate) fn check_incompatible_options_for_ci_llvm(
28272825
current_config_toml: TomlConfig,
28282826
ci_config_toml: TomlConfig,

0 commit comments

Comments
 (0)