diff options
| author | onur-ozkan <work@onurozkan.dev> | 2024-04-10 08:53:07 +0300 |
|---|---|---|
| committer | onur-ozkan <work@onurozkan.dev> | 2024-04-10 08:58:48 +0300 |
| commit | a57a99041616612c8cd7e0cdfe4eb117f9960644 (patch) | |
| tree | 4af188072b1adf65f5531a410bf5e2289109db9c | |
| parent | 3f10032eb04a58d6d54caef0318f705042ca0ba1 (diff) | |
| download | rust-a57a99041616612c8cd7e0cdfe4eb117f9960644.tar.gz rust-a57a99041616612c8cd7e0cdfe4eb117f9960644.zip | |
drop `changelog-seen`
It's been 7 months since we deprecated this. It should be fine to remove it now. Signed-off-by: onur-ozkan <work@onurozkan.dev>
| -rw-r--r-- | src/bootstrap/src/bin/main.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 16 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/bootstrap/src/bin/main.rs b/src/bootstrap/src/bin/main.rs index 340a5c87f0b..4cb67b7aa62 100644 --- a/src/bootstrap/src/bin/main.rs +++ b/src/bootstrap/src/bin/main.rs @@ -131,10 +131,6 @@ fn main() { fn check_version(config: &Config) -> Option<String> { let mut msg = String::new(); - if config.changelog_seen.is_some() { - msg.push_str("WARNING: The use of `changelog-seen` is deprecated. Please refer to `change-id` option in `config.example.toml` instead.\n"); - } - let latest_change_id = CONFIG_CHANGE_HISTORY.last().unwrap().change_id; let warned_id_path = config.out.join("bootstrap").join(".last-warned-change-id"); diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 96dec975250..334cff2fdc5 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -145,7 +145,6 @@ impl LldMode { /// `config.example.toml`. #[derive(Default, Clone)] pub struct Config { - pub changelog_seen: Option<usize>, // FIXME: Deprecated field. Remove it at 2024. pub change_id: Option<usize>, pub bypass_bootstrap_lock: bool, pub ccache: Option<String>, @@ -605,7 +604,6 @@ impl Target { #[derive(Deserialize, Default)] #[serde(deny_unknown_fields, rename_all = "kebab-case")] pub(crate) struct TomlConfig { - changelog_seen: Option<usize>, // FIXME: Deprecated field. Remove it at 2024. #[serde(flatten)] change_id: ChangeIdWrapper, build: Option<Build>, @@ -645,17 +643,7 @@ trait Merge { impl Merge for TomlConfig { fn merge( &mut self, - TomlConfig { - build, - install, - llvm, - rust, - dist, - target, - profile: _, - changelog_seen, - change_id, - }: Self, + TomlConfig { build, install, llvm, rust, dist, target, profile: _, change_id }: Self, replace: ReplaceOpt, ) { fn do_merge<T: Merge>(x: &mut Option<T>, y: Option<T>, replace: ReplaceOpt) { @@ -667,7 +655,6 @@ impl Merge for TomlConfig { } } } - self.changelog_seen.merge(changelog_seen, replace); self.change_id.inner.merge(change_id.inner, replace); do_merge(&mut self.build, build, replace); do_merge(&mut self.install, install, replace); @@ -1400,7 +1387,6 @@ impl Config { } toml.merge(override_toml, ReplaceOpt::Override); - config.changelog_seen = toml.changelog_seen; config.change_id = toml.change_id.inner; let Build { |
