Skip to content

Commit 844e542

Browse files
committed
Port #[rustc_paren_sugar] to the new attribute system
1 parent 57f6f1e commit 844e542

File tree

7 files changed

+19
-5
lines changed

7 files changed

+19
-5
lines changed

compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ pub enum AttributeKind {
305305
/// Represents `#[optimize(size|speed)]`
306306
Optimize(OptimizeAttr, Span),
307307

308+
/// Represents `#[rustc_paren_sugar]`.
309+
ParenSugar(Span),
310+
308311
/// Represents `#[rustc_pass_by_value]` (used by the `rustc_pass_by_value` lint).
309312
PassByValue(Span),
310313

compiler/rustc_attr_data_structures/src/encode_cross_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ impl AttributeKind {
4343
NoImplicitPrelude(..) => No,
4444
NoMangle(..) => No,
4545
Optimize(..) => No,
46+
ParenSugar(..) => No,
4647
PassByValue(..) => Yes,
4748
PubTransparent(..) => Yes,
4849
Repr(..) => No,

compiler/rustc_attr_parsing/src/attributes/traits.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,10 @@ impl<S: Stage> NoArgsAttributeParser<S> for FundamentalParser {
117117
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
118118
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::Fundamental;
119119
}
120+
121+
pub(crate) struct ParenSugarParser;
122+
impl<S: Stage> NoArgsAttributeParser<S> for ParenSugarParser {
123+
const PATH: &[Symbol] = &[sym::rustc_paren_sugar];
124+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
125+
const CREATE: fn(Span) -> AttributeKind = AttributeKind::ParenSugar;
126+
}

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ use crate::attributes::stability::{
3838
};
3939
use crate::attributes::traits::{
4040
CoinductiveParser, ConstTraitParser, DenyExplicitImplParser, DoNotImplementViaObjectParser,
41-
FundamentalParser, MarkerParser, SkipDuringMethodDispatchParser, SpecializationTraitParser,
42-
TypeConstParser, UnsafeSpecializationMarkerParser,
41+
FundamentalParser, MarkerParser, ParenSugarParser, SkipDuringMethodDispatchParser,
42+
SpecializationTraitParser, TypeConstParser, UnsafeSpecializationMarkerParser,
4343
};
4444
use crate::attributes::transparency::TransparencyParser;
4545
use crate::attributes::{AttributeParser as _, Combine, Single, WithoutArgs};
@@ -154,6 +154,7 @@ attribute_parsers!(
154154
Single<WithoutArgs<MayDangleParser>>,
155155
Single<WithoutArgs<NoImplicitPreludeParser>>,
156156
Single<WithoutArgs<NoMangleParser>>,
157+
Single<WithoutArgs<ParenSugarParser>>,
157158
Single<WithoutArgs<PassByValueParser>>,
158159
Single<WithoutArgs<PubTransparentParser>>,
159160
Single<WithoutArgs<SpecializationTraitParser>>,

compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::TraitDef {
864864
hir::Constness::NotConst
865865
};
866866

867-
let paren_sugar = attrs.iter().any(|attr| attr.has_name(sym::rustc_paren_sugar));
867+
let paren_sugar = find_attr!(attrs, AttributeKind::ParenSugar(_));
868868
if paren_sugar && !tcx.features().unboxed_closures() {
869869
tcx.dcx().emit_err(errors::ParenSugarAttribute { span: item.span });
870870
}

compiler/rustc_parse/src/validate_attr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ fn emit_malformed_attribute(
302302
| sym::rustc_unsafe_specialization_marker
303303
| sym::marker
304304
| sym::fundamental
305+
| sym::rustc_paren_sugar
305306
| sym::type_const
306307
| sym::repr
307308
| sym::align

compiler/rustc_passes/src/check_attr.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
131131
}
132132
&Attribute::Parsed(
133133
AttributeKind::SpecializationTrait(attr_span)
134-
| AttributeKind::UnsafeSpecializationMarker(attr_span),
134+
| AttributeKind::UnsafeSpecializationMarker(attr_span)
135+
| AttributeKind::ParenSugar(attr_span),
135136
) => {
136-
// FIXME(specialization): more validation is needed
137+
// FIXME: more validation is needed
137138
self.check_must_be_applied_to_trait(attr_span, span, target);
138139
}
139140
&Attribute::Parsed(AttributeKind::TypeConst(attr_span)) => {

0 commit comments

Comments
 (0)