@@ -145,7 +145,6 @@ impl LldMode {
145145/// `config.example.toml`.
146146#[ derive( Default , Clone ) ]
147147pub struct Config {
148- pub changelog_seen : Option < usize > , // FIXME: Deprecated field. Remove it at 2024.
149148 pub change_id : Option < usize > ,
150149 pub bypass_bootstrap_lock : bool ,
151150 pub ccache : Option < String > ,
@@ -605,7 +604,6 @@ impl Target {
605604#[ derive( Deserialize , Default ) ]
606605#[ serde( deny_unknown_fields, rename_all = "kebab-case" ) ]
607606pub ( crate ) struct TomlConfig {
608- changelog_seen : Option < usize > , // FIXME: Deprecated field. Remove it at 2024.
609607 #[ serde( flatten) ]
610608 change_id : ChangeIdWrapper ,
611609 build : Option < Build > ,
@@ -645,17 +643,7 @@ trait Merge {
645643impl Merge for TomlConfig {
646644 fn merge (
647645 & mut self ,
648- TomlConfig {
649- build,
650- install,
651- llvm,
652- rust,
653- dist,
654- target,
655- profile : _,
656- changelog_seen,
657- change_id,
658- } : Self ,
646+ TomlConfig { build, install, llvm, rust, dist, target, profile : _, change_id } : Self ,
659647 replace : ReplaceOpt ,
660648 ) {
661649 fn do_merge < T : Merge > ( x : & mut Option < T > , y : Option < T > , replace : ReplaceOpt ) {
@@ -667,7 +655,6 @@ impl Merge for TomlConfig {
667655 }
668656 }
669657 }
670- self . changelog_seen . merge ( changelog_seen, replace) ;
671658 self . change_id . inner . merge ( change_id. inner , replace) ;
672659 do_merge ( & mut self . build , build, replace) ;
673660 do_merge ( & mut self . install , install, replace) ;
@@ -1400,7 +1387,6 @@ impl Config {
14001387 }
14011388 toml. merge ( override_toml, ReplaceOpt :: Override ) ;
14021389
1403- config. changelog_seen = toml. changelog_seen ;
14041390 config. change_id = toml. change_id . inner ;
14051391
14061392 let Build {
0 commit comments