@@ -36,8 +36,6 @@ define_config! {
3636 incremental: Option <bool > = "incremental" ,
3737 default_linker: Option <String > = "default-linker" ,
3838 channel: Option <String > = "channel" ,
39- // FIXME: Remove this field at Q2 2025, it has been replaced by build.description
40- description: Option <String > = "description" ,
4139 musl_root: Option <String > = "musl-root" ,
4240 rpath: Option <bool > = "rpath" ,
4341 strip: Option <bool > = "strip" ,
@@ -320,7 +318,6 @@ pub fn check_incompatible_options_for_ci_rustc(
320318 jemalloc,
321319 rpath,
322320 channel,
323- description,
324321 default_linker,
325322 std_features,
326323
@@ -388,7 +385,6 @@ pub fn check_incompatible_options_for_ci_rustc(
388385 err ! ( current_rust_config. std_features, std_features, "rust" ) ;
389386
390387 warn ! ( current_rust_config. channel, channel, "rust" ) ;
391- warn ! ( current_rust_config. description, description, "rust" ) ;
392388
393389 Ok ( ( ) )
394390}
@@ -415,12 +411,7 @@ pub(crate) fn validate_codegen_backends(backends: Vec<String>, section: &str) ->
415411}
416412
417413impl Config {
418- pub fn apply_rust_config (
419- & mut self ,
420- toml_rust : Option < Rust > ,
421- warnings : Warnings ,
422- description : & mut Option < String > ,
423- ) {
414+ pub fn apply_rust_config ( & mut self , toml_rust : Option < Rust > , warnings : Warnings ) {
424415 let mut debug = None ;
425416 let mut rustc_debug_assertions = None ;
426417 let mut std_debug_assertions = None ;
@@ -459,7 +450,6 @@ impl Config {
459450 randomize_layout,
460451 default_linker,
461452 channel : _, // already handled above
462- description : rust_description,
463453 musl_root,
464454 rpath,
465455 verbose_tests,
@@ -552,14 +542,6 @@ impl Config {
552542 set ( & mut self . jemalloc , jemalloc) ;
553543 set ( & mut self . test_compare_mode , test_compare_mode) ;
554544 set ( & mut self . backtrace , backtrace) ;
555- if rust_description. is_some ( ) {
556- eprintln ! (
557- "Warning: rust.description is deprecated. Use build.description instead."
558- ) ;
559- }
560- if description. is_none ( ) {
561- * description = rust_description;
562- }
563545 set ( & mut self . rust_dist_src , dist_src) ;
564546 set ( & mut self . verbose_tests , verbose_tests) ;
565547 // in the case "false" is set explicitly, do not overwrite the command line args
0 commit comments