Skip to content

Commit 68802c4

Browse files
committed
Port #[rustc_specialization_trait] to the new attribute system
1 parent 486e5db commit 68802c4

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
@@ -320,6 +320,9 @@ pub enum AttributeKind {
320320
/// Represents `#[rustc_skip_during_method_dispatch]`.
321321
SkipDuringMethodDispatch { array: bool, boxed_slice: bool, span: Span },
322322

323+
/// Represents `#[rustc_specialization_trait]`.
324+
SpecializationTrait(Span),
325+
323326
/// Represents `#[stable]`, `#[unstable]` and `#[rustc_allowed_through_unstable_modules]`.
324327
Stability {
325328
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
@@ -48,6 +48,7 @@ impl AttributeKind {
4848
RustcLayoutScalarValidRangeStart(..) => Yes,
4949
RustcObjectLifetimeDefault => No,
5050
SkipDuringMethodDispatch { .. } => No,
51+
SpecializationTrait(..) => No,
5152
Stability { .. } => Yes,
5253
TargetFeature(..) => No,
5354
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
@@ -38,7 +38,7 @@ use crate::attributes::stability::{
3838
};
3939
use crate::attributes::traits::{
4040
CoinductiveParser, ConstTraitParser, DenyExplicitImplParser, DoNotImplementViaObjectParser,
41-
SkipDuringMethodDispatchParser, TypeConstParser,
41+
SkipDuringMethodDispatchParser, SpecializationTraitParser, TypeConstParser,
4242
};
4343
use crate::attributes::transparency::TransparencyParser;
4444
use crate::attributes::{AttributeParser as _, Combine, Single, WithoutArgs};
@@ -153,6 +153,7 @@ attribute_parsers!(
153153
Single<WithoutArgs<NoMangleParser>>,
154154
Single<WithoutArgs<PassByValueParser>>,
155155
Single<WithoutArgs<PubTransparentParser>>,
156+
Single<WithoutArgs<SpecializationTraitParser>>,
156157
Single<WithoutArgs<TrackCallerParser>>,
157158
Single<WithoutArgs<TypeConstParser>>,
158159
// tidy-alphabetical-end

compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::TraitDef {
884884
let specialization_kind =
885885
if attrs.iter().any(|attr| attr.has_name(sym::rustc_unsafe_specialization_marker)) {
886886
ty::trait_def::TraitSpecializationKind::Marker
887-
} else if attrs.iter().any(|attr| attr.has_name(sym::rustc_specialization_trait)) {
887+
} else if find_attr!(attrs, AttributeKind::SpecializationTrait(_)) {
888888
ty::trait_def::TraitSpecializationKind::AlwaysApplicable
889889
} else {
890890
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
@@ -298,6 +298,7 @@ fn emit_malformed_attribute(
298298
| sym::rustc_do_not_implement_via_object
299299
| sym::rustc_coinductive
300300
| sym::const_trait
301+
| sym::rustc_specialization_trait
301302
| sym::type_const
302303
| sym::repr
303304
| 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)