Skip to content

Commit

Permalink
Unrolled build for rust-lang#125535
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125535 - onur-ozkan:remove-deprecated-field, r=clubby789

clean-up: remove deprecated field `dist.missing-tools`

It's been 5 months since this field was deprecated.
  • Loading branch information
rust-timer committed May 27, 2024
2 parents a59072e + c76477d commit f5201cc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
3 changes: 0 additions & 3 deletions config.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -904,9 +904,6 @@
# on linux
#src-tarball = true

# Whether to allow failures when building tools
#missing-tools = false

# List of compression formats to use when generating dist tarballs. The list of
# formats is provided to rust-installer, which must support all of them.
#
Expand Down
4 changes: 0 additions & 4 deletions src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ pub struct Config {
pub save_toolstates: Option<PathBuf>,
pub print_step_timings: bool,
pub print_step_rusage: bool,
pub missing_tools: bool, // FIXME: Deprecated field. Remove it at 2024.

// Fallback musl-root for all targets
pub musl_root: Option<PathBuf>,
Expand Down Expand Up @@ -905,7 +904,6 @@ define_config! {
sign_folder: Option<String> = "sign-folder",
upload_addr: Option<String> = "upload-addr",
src_tarball: Option<bool> = "src-tarball",
missing_tools: Option<bool> = "missing-tools",
compression_formats: Option<Vec<String>> = "compression-formats",
compression_profile: Option<String> = "compression-profile",
include_mingw_linker: Option<bool> = "include-mingw-linker",
Expand Down Expand Up @@ -1936,7 +1934,6 @@ impl Config {
sign_folder,
upload_addr,
src_tarball,
missing_tools,
compression_formats,
compression_profile,
include_mingw_linker,
Expand All @@ -1946,7 +1943,6 @@ impl Config {
config.dist_compression_formats = compression_formats;
set(&mut config.dist_compression_profile, compression_profile);
set(&mut config.rust_dist_src, src_tarball);
set(&mut config.missing_tools, missing_tools);
set(&mut config.dist_include_mingw_linker, include_mingw_linker)
}

Expand Down
5 changes: 5 additions & 0 deletions src/bootstrap/src/utils/change_tracker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
severity: ChangeSeverity::Warning,
summary: "`rust.lld` has a new default value of `true` on `x86_64-unknown-linux-gnu`. Starting at stage1, `rust-lld` will thus be this target's default linker. No config changes should be necessary.",
},
ChangeInfo {
change_id: 125535,
severity: ChangeSeverity::Warning,
summary: "Removed `dist.missing-tools` configuration as it was deprecated long time ago.",
},
];

0 comments on commit f5201cc

Please sign in to comment.