Skip to content

Commit 2662a2d

Browse files
committed
Port #[rustc_specialization_trait] to the new attribute system
1 parent 34b16b4 commit 2662a2d

File tree

7 files changed

+17
-3
lines changed

7 files changed

+17
-3
lines changed

compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@ pub enum AttributeKind {
314314
/// Represents `#[rustc_skip_during_method_dispatch]`.
315315
SkipDuringMethodDispatch { array: bool, boxed_slice: bool, span: Span },
316316

317+
/// Represents `#[rustc_specialization_trait]`.
318+
SpecializationTrait(Span),
319+
317320
/// Represents `#[stable]`, `#[unstable]` and `#[rustc_allowed_through_unstable_modules]`.
318321
Stability {
319322
stability: Stability,

compiler/rustc_attr_data_structures/src/encode_cross_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ impl AttributeKind {
4646
RustcLayoutScalarValidRangeStart(..) => Yes,
4747
RustcObjectLifetimeDefault => No,
4848
SkipDuringMethodDispatch { .. } => No,
49+
SpecializationTrait(..) => No,
4950
Stability { .. } => Yes,
5051
TargetFeature(..) => No,
5152
TrackCaller(..) => Yes,

compiler/rustc_attr_parsing/src/attributes/traits.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,10 @@ impl<S: Stage> NoArgsAttributeParser<S> for TypeConstParser {
8989
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
9090
const CREATE: fn(Span) -> AttributeKind = AttributeKind::TypeConst;
9191
}
92+
93+
pub(crate) struct SpecializationTraitParser;
94+
impl<S: Stage> NoArgsAttributeParser<S> for SpecializationTraitParser {
95+
const PATH: &[Symbol] = &[sym::rustc_specialization_trait];
96+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
97+
const CREATE: fn(Span) -> AttributeKind = AttributeKind::SpecializationTrait;
98+
}

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use crate::attributes::stability::{
3737
};
3838
use crate::attributes::traits::{
3939
CoinductiveParser, ConstTraitParser, DenyExplicitImplParser, DoNotImplementViaObjectParser,
40-
SkipDuringMethodDispatchParser, TypeConstParser,
40+
SkipDuringMethodDispatchParser, SpecializationTraitParser, TypeConstParser,
4141
};
4242
use crate::attributes::transparency::TransparencyParser;
4343
use crate::attributes::{AttributeParser as _, Combine, Single, WithoutArgs};
@@ -150,6 +150,7 @@ attribute_parsers!(
150150
Single<WithoutArgs<MayDangleParser>>,
151151
Single<WithoutArgs<NoMangleParser>>,
152152
Single<WithoutArgs<PubTransparentParser>>,
153+
Single<WithoutArgs<SpecializationTraitParser>>,
153154
Single<WithoutArgs<TrackCallerParser>>,
154155
Single<WithoutArgs<TypeConstParser>>,
155156
// tidy-alphabetical-end

compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::TraitDef {
883883
let specialization_kind =
884884
if attrs.iter().any(|attr| attr.has_name(sym::rustc_unsafe_specialization_marker)) {
885885
ty::trait_def::TraitSpecializationKind::Marker
886-
} else if attrs.iter().any(|attr| attr.has_name(sym::rustc_specialization_trait)) {
886+
} else if find_attr!(attrs, AttributeKind::SpecializationTrait(_)) {
887887
ty::trait_def::TraitSpecializationKind::AlwaysApplicable
888888
} else {
889889
ty::trait_def::TraitSpecializationKind::None

compiler/rustc_parse/src/validate_attr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ fn emit_malformed_attribute(
297297
| sym::rustc_do_not_implement_via_object
298298
| sym::rustc_coinductive
299299
| sym::const_trait
300+
| sym::rustc_specialization_trait
300301
| sym::type_const
301302
| sym::repr
302303
| sym::align

compiler/rustc_passes/src/check_attr.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
125125
| AttributeKind::Coinductive(attr_span)
126126
| AttributeKind::ConstTrait(attr_span)
127127
| AttributeKind::DenyExplicitImpl(attr_span)
128-
| AttributeKind::DoNotImplementViaObject(attr_span),
128+
| AttributeKind::DoNotImplementViaObject(attr_span)
129+
| AttributeKind::SpecializationTrait(attr_span),
129130
) => {
130131
self.check_must_be_applied_to_trait(*attr_span, span, target);
131132
}

0 commit comments

Comments
 (0)