@@ -262,8 +262,8 @@ pub struct Config {
262
262
pub rust_optimize : RustOptimize ,
263
263
pub rust_codegen_units : Option < u32 > ,
264
264
pub rust_codegen_units_std : Option < u32 > ,
265
- pub rust_debug_assertions : bool ,
266
- pub rust_debug_assertions_std : bool ,
265
+ pub rustc_debug_assertions : bool ,
266
+ pub std_debug_assertions : bool ,
267
267
pub rust_overflow_checks : bool ,
268
268
pub rust_overflow_checks_std : bool ,
269
269
pub rust_debug_logging : bool ,
@@ -1109,9 +1109,9 @@ define_config! {
1109
1109
debug: Option <bool > = "debug" ,
1110
1110
codegen_units: Option <u32 > = "codegen-units" ,
1111
1111
codegen_units_std: Option <u32 > = "codegen-units-std" ,
1112
- debug_assertions : Option <bool > = "debug-assertions" ,
1112
+ rustc_debug_assertions : Option <bool > = "debug-assertions" ,
1113
1113
randomize_layout: Option <bool > = "randomize-layout" ,
1114
- debug_assertions_std : Option <bool > = "debug-assertions-std" ,
1114
+ std_debug_assertions : Option <bool > = "debug-assertions-std" ,
1115
1115
overflow_checks: Option <bool > = "overflow-checks" ,
1116
1116
overflow_checks_std: Option <bool > = "overflow-checks-std" ,
1117
1117
debug_logging: Option <bool > = "debug-logging" ,
@@ -1644,8 +1644,8 @@ impl Config {
1644
1644
let mut llvm_enzyme = None ;
1645
1645
let mut llvm_plugins = None ;
1646
1646
let mut debug = None ;
1647
- let mut debug_assertions = None ;
1648
- let mut debug_assertions_std = None ;
1647
+ let mut rustc_debug_assertions = None ;
1648
+ let mut std_debug_assertions = None ;
1649
1649
let mut overflow_checks = None ;
1650
1650
let mut overflow_checks_std = None ;
1651
1651
let mut debug_logging = None ;
@@ -1667,8 +1667,8 @@ impl Config {
1667
1667
debug : debug_toml,
1668
1668
codegen_units,
1669
1669
codegen_units_std,
1670
- debug_assertions : debug_assertions_toml ,
1671
- debug_assertions_std : debug_assertions_std_toml ,
1670
+ rustc_debug_assertions : rustc_debug_assertions_toml ,
1671
+ std_debug_assertions : std_debug_assertions_toml ,
1672
1672
overflow_checks : overflow_checks_toml,
1673
1673
overflow_checks_std : overflow_checks_std_toml,
1674
1674
debug_logging : debug_logging_toml,
@@ -1726,8 +1726,8 @@ impl Config {
1726
1726
config. download_ci_rustc_commit ( download_rustc, config. llvm_assertions ) ;
1727
1727
1728
1728
debug = debug_toml;
1729
- debug_assertions = debug_assertions_toml ;
1730
- debug_assertions_std = debug_assertions_std_toml ;
1729
+ rustc_debug_assertions = rustc_debug_assertions_toml ;
1730
+ std_debug_assertions = std_debug_assertions_toml ;
1731
1731
overflow_checks = overflow_checks_toml;
1732
1732
overflow_checks_std = overflow_checks_std_toml;
1733
1733
debug_logging = debug_logging_toml;
@@ -2136,14 +2136,13 @@ impl Config {
2136
2136
config. rust_std_features = std_features. unwrap_or ( default_std_features) ;
2137
2137
2138
2138
let default = debug == Some ( true ) ;
2139
- config. rust_debug_assertions = debug_assertions. unwrap_or ( default) ;
2140
- config. rust_debug_assertions_std =
2141
- debug_assertions_std. unwrap_or ( config. rust_debug_assertions ) ;
2139
+ config. rustc_debug_assertions = rustc_debug_assertions. unwrap_or ( default) ;
2140
+ config. std_debug_assertions = std_debug_assertions. unwrap_or ( config. rustc_debug_assertions ) ;
2142
2141
config. rust_overflow_checks = overflow_checks. unwrap_or ( default) ;
2143
2142
config. rust_overflow_checks_std =
2144
2143
overflow_checks_std. unwrap_or ( config. rust_overflow_checks ) ;
2145
2144
2146
- config. rust_debug_logging = debug_logging. unwrap_or ( config. rust_debug_assertions ) ;
2145
+ config. rust_debug_logging = debug_logging. unwrap_or ( config. rustc_debug_assertions ) ;
2147
2146
2148
2147
let with_defaults = |debuginfo_level_specific : Option < _ > | {
2149
2148
debuginfo_level_specific. or ( debuginfo_level) . unwrap_or ( if debug == Some ( true ) {
@@ -3084,8 +3083,8 @@ fn check_incompatible_options_for_ci_rustc(
3084
3083
debug : _,
3085
3084
codegen_units : _,
3086
3085
codegen_units_std : _,
3087
- debug_assertions : _,
3088
- debug_assertions_std : _,
3086
+ rustc_debug_assertions : _,
3087
+ std_debug_assertions : _,
3089
3088
overflow_checks : _,
3090
3089
overflow_checks_std : _,
3091
3090
debuginfo_level : _,
0 commit comments