Skip to content

Commit 4579615

Browse files
committed
modify config.toml->bootstrap.toml for new upstream changes
1 parent 9ef42ba commit 4579615

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

compiler/rustc_session/src/options.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ top_level_options!(
389389
///
390390
/// This directory is what the virtual `/rustc/$hash` is translated back to,
391391
/// if Rust was built with path remapping to `/rustc/$hash` enabled
392-
/// (the `rust.remap-debuginfo` option in `config.toml`).
392+
/// (the `rust.remap-debuginfo` option in `bootstrap.toml`).
393393
real_rust_source_base_dir: Option<PathBuf> [TRACKED_NO_CRATE_HASH],
394394

395395
edition: Edition [TRACKED],

src/bootstrap/src/core/download.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ download-rustc = false
845845
HELP: There could be two reasons behind this:
846846
1) The host triple is not supported for `download-ci-gcc`.
847847
2) Old builds get deleted after a certain time.
848-
HELP: In either case, disable `download-ci-gcc` in your config.toml:
848+
HELP: In either case, disable `download-ci-gcc` in your bootstrap.toml:
849849
850850
[gcc]
851851
download-ci-gcc = false

src/bootstrap/src/utils/cc_detect.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ pub fn find(build: &Build) {
122122

123123
/// Probes and configures the C and C++ compilers for a single target.
124124
///
125-
/// This function uses both user-specified configuration (from `config.toml`) and auto-detection
125+
/// This function uses both user-specified configuration (from `bootstrap.toml`) and auto-detection
126126
/// logic to determine the correct C/C++ compilers for the target. It also determines the appropriate
127127
/// archiver (`ar`) and sets up additional compilation flags (both handled and unhandled).
128128
pub fn find_target(build: &Build, target: TargetSelection) {
@@ -186,7 +186,7 @@ pub fn find_target(build: &Build, target: TargetSelection) {
186186
}
187187

188188
/// Determines the default compiler for a given target and language when not explicitly
189-
/// configured in `config.toml`.
189+
/// configured in `bootstrap.toml`.
190190
fn default_compiler(
191191
cfg: &mut cc::Build,
192192
compiler: Language,

src/bootstrap/src/utils/change_tracker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
387387
},
388388
ChangeInfo {
389389
change_id: 137081,
390-
severity: ChangeSeverity::Info,
390+
severity: ChangeSeverity::Warning,
391391
summary: "The default configuration filename has changed from `config.toml` to `bootstrap.toml`. `config.toml` is deprecated but remains supported for backward compatibility.",
392392
},
393393
];

0 commit comments

Comments
 (0)