@@ -145,7 +145,6 @@ impl LldMode {
145
145
/// `config.example.toml`.
146
146
#[ derive( Default , Clone ) ]
147
147
pub struct Config {
148
- pub changelog_seen : Option < usize > , // FIXME: Deprecated field. Remove it at 2024.
149
148
pub change_id : Option < usize > ,
150
149
pub bypass_bootstrap_lock : bool ,
151
150
pub ccache : Option < String > ,
@@ -605,7 +604,6 @@ impl Target {
605
604
#[ derive( Deserialize , Default ) ]
606
605
#[ serde( deny_unknown_fields, rename_all = "kebab-case" ) ]
607
606
pub ( crate ) struct TomlConfig {
608
- changelog_seen : Option < usize > , // FIXME: Deprecated field. Remove it at 2024.
609
607
#[ serde( flatten) ]
610
608
change_id : ChangeIdWrapper ,
611
609
build : Option < Build > ,
@@ -645,17 +643,7 @@ trait Merge {
645
643
impl Merge for TomlConfig {
646
644
fn merge (
647
645
& 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 ,
659
647
replace : ReplaceOpt ,
660
648
) {
661
649
fn do_merge < T : Merge > ( x : & mut Option < T > , y : Option < T > , replace : ReplaceOpt ) {
@@ -667,7 +655,6 @@ impl Merge for TomlConfig {
667
655
}
668
656
}
669
657
}
670
- self . changelog_seen . merge ( changelog_seen, replace) ;
671
658
self . change_id . inner . merge ( change_id. inner , replace) ;
672
659
do_merge ( & mut self . build , build, replace) ;
673
660
do_merge ( & mut self . install , install, replace) ;
@@ -1400,7 +1387,6 @@ impl Config {
1400
1387
}
1401
1388
toml. merge ( override_toml, ReplaceOpt :: Override ) ;
1402
1389
1403
- config. changelog_seen = toml. changelog_seen ;
1404
1390
config. change_id = toml. change_id . inner ;
1405
1391
1406
1392
let Build {
0 commit comments