add deprecated and do nothing flag to options table

Author: klensy

compiler/rustc_driver_impl/src/lib.rs

@@ -1158,11 +1158,12 @@ fn describe_codegen_flags() {
 
 fn print_flag_list<T>(
     cmdline_opt: &str,
-    flag_list: &[(&'static str, T, &'static str, &'static str)],
+    flag_list: &[(&'static str, T, &'static str, &'static str, bool)],
 ) {
-    let max_len = flag_list.iter().map(|&(name, _, _, _)| name.chars().count()).max().unwrap_or(0);
+    let max_len =
+        flag_list.iter().map(|&(name, _, _, _, _)| name.chars().count()).max().unwrap_or(0);
 
-    for &(name, _, _, desc) in flag_list {
+    for &(name, _, _, desc, _) in flag_list {
         safe_println!(
             "    {} {:>width$}=val -- {}",
             cmdline_opt,

compiler/rustc_session/src/options.rs

@@ -239,7 +239,8 @@ macro_rules! options {
         $init:expr,
         $parse:ident,
         [$dep_tracking_marker:ident],
-        $desc:expr)
+        $desc:expr
+        $(, deprecated_do_nothing: $dnn:literal )?)
      ),* ,) =>
 (
     #[derive(Clone)]
@@ -280,7 +281,7 @@ macro_rules! options {
     }
 
     pub const $stat: OptionDescrs<$struct_name> =
-        &[ $( (stringify!($opt), $optmod::$opt, desc::$parse, $desc) ),* ];
+        &[ $( (stringify!($opt), $optmod::$opt, desc::$parse, $desc, false $( || $dnn )? ) ),* ];
 
     mod $optmod {
     $(
@@ -315,7 +316,8 @@ macro_rules! redirect_field {
 }
 
 type OptionSetter<O> = fn(&mut O, v: Option<&str>) -> bool;
-type OptionDescrs<O> = &'static [(&'static str, OptionSetter<O>, &'static str, &'static str)];
+type OptionDescrs<O> =
+    &'static [(&'static str, OptionSetter<O>, &'static str, &'static str, bool)];
 
 #[allow(rustc::untranslatable_diagnostic)] // FIXME: make this translatable
 fn build_options<O: Default>(
@@ -334,7 +336,7 @@ fn build_options<O: Default>(
 
         let option_to_lookup = key.replace('-', "_");
         match descrs.iter().find(|(name, ..)| *name == option_to_lookup) {
-            Some((_, setter, type_desc, _)) => {
+            Some((_, setter, type_desc, _, _)) => {
                 if !setter(&mut op, value) {
                     match value {
                         None => early_dcx.early_fatal(