Skip to content

Reformat top_level_options! and options! macro declarations #155331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Apr 15, 2026
+170 −96
Merged

Reformat top_level_options! and options! macro declarations #155331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 170 additions & 96 deletions compiler/rustc_session/src/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ macro_rules! hash_substruct {
($opt_name:ident, $opt_expr:expr, $error_format:expr, $for_crate_hash:expr, $hasher:expr, [UNTRACKED]) => {{}};
($opt_name:ident, $opt_expr:expr, $error_format:expr, $for_crate_hash:expr, $hasher:expr, [TRACKED]) => {{}};
($opt_name:ident, $opt_expr:expr, $error_format:expr, $for_crate_hash:expr, $hasher:expr, [TRACKED_NO_CRATE_HASH]) => {{}};
($opt_name:ident, $opt_expr:expr, $error_format:expr, $for_crate_hash:expr, $hasher:expr, [SUBSTRUCT]) => {
($opt_name:ident, $opt_expr:expr, $error_format:expr, $for_crate_hash:expr, $hasher:expr, [SUBSTRUCT]) => {{
Comment thread
petrochenkov marked this conversation as resolved.
use crate::config::dep_tracking::DepTrackingHash;
$opt_expr.dep_tracking_hash($for_crate_hash, $error_format).hash(
$hasher,
$error_format,
$for_crate_hash,
);
};
}};
}

/// Extended target modifier info.
Expand Down Expand Up @@ -309,61 +309,85 @@ macro_rules! top_level_tmod_enum {
}

macro_rules! top_level_options {
( $( #[$top_level_attr:meta] )* pub struct Options { $(
$( #[$attr:meta] )*
$opt:ident : $t:ty [$dep_tracking_marker:ident $( $tmod:ident $variant:ident )?],
)* } ) => (
top_level_tmod_enum!( {$([$dep_tracking_marker $($tmod $variant),*])|*} );
(
$(#[$top_level_attr:meta])*
pub struct Options {
$(
$(#[$attr:meta])*
$opt:ident : $t:ty [
$dep_tracking_marker:ident
$( $tmod:ident $variant:ident )?
],
)*
}
) => {
top_level_tmod_enum!(
{
$(
[$dep_tracking_marker $($tmod $variant),*]
)|*
}
);

#[derive(Clone)]
$( #[$top_level_attr] )*
$(#[$top_level_attr])*
pub struct Options {
$(
$( #[$attr] )*
pub $opt: $t
),*,
$(#[$attr])*
pub $opt: $t,
)*
pub target_modifiers: BTreeMap<OptionsTargetModifiers, String>,
pub mitigation_coverage_map: mitigation_coverage::MitigationCoverageMap,
}

impl Options {
pub fn dep_tracking_hash(&self, for_crate_hash: bool) -> Hash64 {
let mut sub_hashes = BTreeMap::new();
$({
hash_opt!($opt,
&self.$opt,
&mut sub_hashes,
for_crate_hash,
[$dep_tracking_marker]);
})*
$(
hash_opt!(
$opt,
&self.$opt,
&mut sub_hashes,
for_crate_hash,
[$dep_tracking_marker]
);
)*
let mut hasher = StableHasher::new();
dep_tracking::stable_hash(sub_hashes,
&mut hasher,
self.error_format,
for_crate_hash);
$({
hash_substruct!($opt,
dep_tracking::stable_hash(
sub_hashes,
&mut hasher,
self.error_format,
for_crate_hash,
);
$(
hash_substruct!(
$opt,
&self.$opt,
self.error_format,
for_crate_hash,
&mut hasher,
[$dep_tracking_marker]);
})*
[$dep_tracking_marker]
);
)*
hasher.finish()
}

pub fn gather_target_modifiers(&self) -> Vec<TargetModifier> {
let mut mods = Vec::<TargetModifier>::new();
$({
gather_tmods_top_level!($opt,
&self.$opt, &mut mods, &self.target_modifiers,
[$dep_tracking_marker $($tmod),*]);
})*
$(
gather_tmods_top_level!(
$opt,
&self.$opt,
&mut mods,
&self.target_modifiers,
[$dep_tracking_marker $($tmod),*]
);
)*
mods.sort_by(|a, b| a.opt.cmp(&b.opt));
mods
}
}
);
}
}

top_level_options!(
Expand Down Expand Up @@ -658,80 +682,130 @@ macro_rules! setter_for {
/// generated code to parse an option into its respective field in the struct. There are a few
/// hand-written parsers for parsing specific types of values in this module.
macro_rules! options {
($struct_name:ident, $tmod_enum_name:ident, $stat:ident, $optmod:ident, $prefix:expr, $outputname:expr,
$($( #[$attr:meta] )* $opt:ident : $t:ty = (
$init:expr,
$parse:ident,
[$dep_tracking_marker:ident $( $modifier_kind:ident )?],
$desc:expr
$(, removed: $removed:ident )?)
),* ,) =>
(
#[derive(Clone)]
#[rustc_lint_opt_ty]
pub struct $struct_name { $( $( #[$attr] )* pub $opt: $t),* }
(
$struct_name:ident,
$tmod_enum_name:ident,
$stat:ident,
$optmod:ident,
$prefix:expr,
$outputname:expr,

$(
$(#[$attr:meta])*
$opt:ident : $t:ty = (
$init:expr,
$parse:ident,
[$dep_tracking_marker:ident $( $modifier_kind:ident )?],
$desc:expr
$(, removed: $removed:ident )?
),
)*
) => {
#[derive(Clone)]
#[rustc_lint_opt_ty]
pub struct $struct_name {
$(
$(#[$attr])*
pub $opt: $t,
)*
}

tmod_enum!( $tmod_enum_name, $prefix, {$($opt, $parse, $t, [$($modifier_kind),*])|*} );
tmod_enum!(
$tmod_enum_name,
$prefix,
{
$(
$opt, $parse, $t, [$($modifier_kind),*]
)|*
}
);

impl Default for $struct_name {
fn default() -> $struct_name {
$struct_name { $($opt: $init),* }
impl Default for $struct_name {
fn default() -> $struct_name {
$struct_name {
$(
$opt: $init,
)*
}
}
}
}

impl $struct_name {
pub fn build(
early_dcx: &EarlyDiagCtxt,
matches: &getopts::Matches,
target_modifiers: &mut CollectedOptions,
) -> $struct_name {
build_options(early_dcx, matches, target_modifiers, $stat, $prefix, $outputname)
}
impl $struct_name {
pub fn build(
early_dcx: &EarlyDiagCtxt,
matches: &getopts::Matches,
target_modifiers: &mut CollectedOptions,
) -> $struct_name {
build_options(early_dcx, matches, target_modifiers, $stat, $prefix, $outputname)
}

fn dep_tracking_hash(&self, for_crate_hash: bool, error_format: ErrorOutputType) -> Hash64 {
let mut sub_hashes = BTreeMap::new();
$({
hash_opt!($opt,
&self.$opt,
&mut sub_hashes,
for_crate_hash,
[$dep_tracking_marker]);
})*
let mut hasher = StableHasher::new();
dep_tracking::stable_hash(sub_hashes,
&mut hasher,
error_format,
for_crate_hash
);
hasher.finish()
}
fn dep_tracking_hash(
&self,
for_crate_hash: bool,
error_format: ErrorOutputType,
) -> Hash64 {
let mut sub_hashes = BTreeMap::new();
$(
hash_opt!(
$opt,
&self.$opt,
&mut sub_hashes,
for_crate_hash,
[$dep_tracking_marker]
);
)*
let mut hasher = StableHasher::new();
dep_tracking::stable_hash(
sub_hashes,
&mut hasher,
error_format,
for_crate_hash,
);
hasher.finish()
}

pub fn gather_target_modifiers(
&self,
_mods: &mut Vec<TargetModifier>,
_tmod_vals: &BTreeMap<OptionsTargetModifiers, String>,
) {
$({
gather_tmods!($struct_name, $tmod_enum_name, $opt, &self.$opt, $init, _mods, _tmod_vals,
[$dep_tracking_marker], [$($modifier_kind),*]);
})*
pub fn gather_target_modifiers(
&self,
_mods: &mut Vec<TargetModifier>,
_tmod_vals: &BTreeMap<OptionsTargetModifiers, String>,
) {
$(
gather_tmods!(
$struct_name,
$tmod_enum_name,
$opt,
&self.$opt,
$init,
_mods,
_tmod_vals,
[$dep_tracking_marker],
[$($modifier_kind),*]
);
)*
}
}
}

pub const $stat: OptionDescrs<$struct_name> =
&[ $( OptionDesc{ name: stringify!($opt), setter: $optmod::$opt,
type_desc: desc::$parse, desc: $desc, removed: None $( .or(Some(RemovedOption::$removed)) )?,
tmod: tmod_enum_opt!($struct_name, $tmod_enum_name, $opt, $($modifier_kind),*),
mitigation: mitigation_enum_opt!($opt, $($modifier_kind),*),
} ),* ];
pub const $stat: OptionDescrs<$struct_name> = &[
$(
OptionDesc {
name: stringify!($opt),
setter: $optmod::$opt,
type_desc: desc::$parse,
desc: $desc,
removed: None $( .or(Some(RemovedOption::$removed)) )?,
tmod: tmod_enum_opt!($struct_name, $tmod_enum_name, $opt, $($modifier_kind),*),
mitigation: mitigation_enum_opt!($opt, $($modifier_kind),*),
},
)*
];

mod $optmod {
$(
setter_for!($opt, $struct_name, $parse);
)*
mod $optmod {
$(
setter_for!($opt, $struct_name, $parse);
)*
}
}

) }
}

impl CodegenOptions {
// JUSTIFICATION: defn of the suggested wrapper fn
Expand Down
Loading