bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_feature: remove no-longer-needed macro

Browse source
This commit is contained in:
Ralf Jung 2024-10-23 07:29:25 +01:00
parent ad3991d303
commit 7340b9c7c2
1 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
compiler/rustc_feature/src/builtin_attrs.rs
View file

@ -12,33 +12,31 @@ use crate::{Features, Stability};
type GateFn = fn(&Features) -> bool; type GateFn = fn(&Features) -> bool;
macro_rules! cfg_fn {
($field: ident) => {
Features::$field as GateFn
};
}
pub type GatedCfg = (Symbol, Symbol, GateFn); pub type GatedCfg = (Symbol, Symbol, GateFn);
/// `cfg(...)`'s that are feature gated. /// `cfg(...)`'s that are feature gated.
const GATED_CFGS: &[GatedCfg] = &[ const GATED_CFGS: &[GatedCfg] = &[
// (name in cfg, feature, function to check if the feature is enabled) // (name in cfg, feature, function to check if the feature is enabled)
(sym::overflow_checks, sym::cfg_overflow_checks, cfg_fn!(cfg_overflow_checks)), (sym::overflow_checks, sym::cfg_overflow_checks, Features::cfg_overflow_checks),
(sym::ub_checks, sym::cfg_ub_checks, cfg_fn!(cfg_ub_checks)), (sym::ub_checks, sym::cfg_ub_checks, Features::cfg_ub_checks),
(sym::target_thread_local, sym::cfg_target_thread_local, cfg_fn!(cfg_target_thread_local)), (sym::target_thread_local, sym::cfg_target_thread_local, Features::cfg_target_thread_local),
( (
sym::target_has_atomic_equal_alignment, sym::target_has_atomic_equal_alignment,
sym::cfg_target_has_atomic_equal_alignment, sym::cfg_target_has_atomic_equal_alignment,
cfg_fn!(cfg_target_has_atomic_equal_alignment), Features::cfg_target_has_atomic_equal_alignment,
), ),
(sym::target_has_atomic_load_store, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)), (
(sym::sanitize, sym::cfg_sanitize, cfg_fn!(cfg_sanitize)), sym::target_has_atomic_load_store,
(sym::version, sym::cfg_version, cfg_fn!(cfg_version)), sym::cfg_target_has_atomic,
(sym::relocation_model, sym::cfg_relocation_model, cfg_fn!(cfg_relocation_model)), Features::cfg_target_has_atomic,
(sym::sanitizer_cfi_generalize_pointers, sym::cfg_sanitizer_cfi, cfg_fn!(cfg_sanitizer_cfi)), ),
(sym::sanitizer_cfi_normalize_integers, sym::cfg_sanitizer_cfi, cfg_fn!(cfg_sanitizer_cfi)), (sym::sanitize, sym::cfg_sanitize, Features::cfg_sanitize),
(sym::version, sym::cfg_version, Features::cfg_version),
(sym::relocation_model, sym::cfg_relocation_model, Features::cfg_relocation_model),
(sym::sanitizer_cfi_generalize_pointers, sym::cfg_sanitizer_cfi, Features::cfg_sanitizer_cfi),
(sym::sanitizer_cfi_normalize_integers, sym::cfg_sanitizer_cfi, Features::cfg_sanitizer_cfi),
// this is consistent with naming of the compiler flag it's for // this is consistent with naming of the compiler flag it's for
(sym::fmt_debug, sym::fmt_debug, cfg_fn!(fmt_debug)), (sym::fmt_debug, sym::fmt_debug, Features::fmt_debug),
]; ];
/// Find a gated cfg determined by the `pred`icate which is given the cfg's name. /// Find a gated cfg determined by the `pred`icate which is given the cfg's name.
@ -220,7 +218,7 @@ macro_rules! gated {
safety: AttributeSafety::Unsafe, safety: AttributeSafety::Unsafe,
template: $tpl, template: $tpl,
duplicates: $duplicates, duplicates: $duplicates,
gate: Gated(Stability::Unstable, sym::$gate, $msg, cfg_fn!($gate)), gate: Gated(Stability::Unstable, sym::$gate, $msg, Features::$gate),
} }
}; };
(unsafe $attr:ident, $typ:expr, $tpl:expr, $duplicates:expr, $encode_cross_crate:expr, $msg:expr $(,)?) => { (unsafe $attr:ident, $typ:expr, $tpl:expr, $duplicates:expr, $encode_cross_crate:expr, $msg:expr $(,)?) => {
@ -231,7 +229,7 @@ macro_rules! gated {
safety: AttributeSafety::Unsafe, safety: AttributeSafety::Unsafe,
template: $tpl, template: $tpl,
duplicates: $duplicates, duplicates: $duplicates,
gate: Gated(Stability::Unstable, sym::$attr, $msg, cfg_fn!($attr)), gate: Gated(Stability::Unstable, sym::$attr, $msg, Features::$attr),
} }
}; };
($attr:ident, $typ:expr, $tpl:expr, $duplicates:expr, $encode_cross_crate:expr, $gate:ident, $msg:expr $(,)?) => { ($attr:ident, $typ:expr, $tpl:expr, $duplicates:expr, $encode_cross_crate:expr, $gate:ident, $msg:expr $(,)?) => {
@ -242,7 +240,7 @@ macro_rules! gated {
safety: AttributeSafety::Normal, safety: AttributeSafety::Normal,
template: $tpl, template: $tpl,
duplicates: $duplicates, duplicates: $duplicates,
gate: Gated(Stability::Unstable, sym::$gate, $msg, cfg_fn!($gate)), gate: Gated(Stability::Unstable, sym::$gate, $msg, Features::$gate),
} }
}; };
($attr:ident, $typ:expr, $tpl:expr, $duplicates:expr, $encode_cross_crate:expr, $msg:expr $(,)?) => { ($attr:ident, $typ:expr, $tpl:expr, $duplicates:expr, $encode_cross_crate:expr, $msg:expr $(,)?) => {
@ -253,7 +251,7 @@ macro_rules! gated {
safety: AttributeSafety::Normal, safety: AttributeSafety::Normal,
template: $tpl, template: $tpl,
duplicates: $duplicates, duplicates: $duplicates,
gate: Gated(Stability::Unstable, sym::$attr, $msg, cfg_fn!($attr)), gate: Gated(Stability::Unstable, sym::$attr, $msg, Features::$attr),
} }
}; };
} }
@ -282,7 +280,7 @@ macro_rules! rustc_attr {
safety: AttributeSafety::Normal, safety: AttributeSafety::Normal,
template: $tpl, template: $tpl,
duplicates: $duplicates, duplicates: $duplicates,
gate: Gated(Stability::Unstable, sym::rustc_attrs, $msg, cfg_fn!(rustc_attrs)), gate: Gated(Stability::Unstable, sym::rustc_attrs, $msg, Features::rustc_attrs),
} }
}; };
} }
@ -935,7 +933,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
Stability::Unstable, Stability::Unstable,
sym::rustc_attrs, sym::rustc_attrs,
"diagnostic items compiler internal support for linting", "diagnostic items compiler internal support for linting",
cfg_fn!(rustc_attrs), Features::rustc_attrs,
), ),
}, },
gated!( gated!(