Skip to content

Commit 938916d

Browse files
committed
Port #[rustc_deny_explicit_impl] to the new attribute system
1 parent 62f58db commit 938916d

File tree

7 files changed

+19
-4
lines changed

7 files changed

+19
-4
lines changed

compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ pub enum AttributeKind {
237237
/// Represents `#[const_trait]`.
238238
ConstTrait(Span),
239239

240+
///Represents `#[rustc_deny_explicit_impl]`.
241+
DenyExplicitImpl(Span),
242+
240243
/// Represents [`#[deprecated]`](https://doc.rust-lang.org/stable/reference/attributes/diagnostics.html#the-deprecated-attribute).
241244
Deprecation { deprecation: Deprecation, span: Span },
242245

compiler/rustc_attr_data_structures/src/encode_cross_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ impl AttributeKind {
2424
ConstStability { .. } => Yes,
2525
ConstStabilityIndirect => No,
2626
ConstTrait(..) => No,
27+
DenyExplicitImpl(..) => No,
2728
Deprecation { .. } => Yes,
2829
DocComment { .. } => Yes,
2930
Dummy => No,

compiler/rustc_attr_parsing/src/attributes/traits.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,10 @@ impl<S: Stage> NoArgsAttributeParser<S> for ConstTraitParser {
6161
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
6262
const CREATE: fn(Span) -> AttributeKind = AttributeKind::ConstTrait;
6363
}
64+
65+
pub(crate) struct DenyExplicitImplParser;
66+
impl<S: Stage> NoArgsAttributeParser<S> for DenyExplicitImplParser {
67+
const PATH: &[Symbol] = &[sym::rustc_deny_explicit_impl];
68+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
69+
const CREATE: fn(Span) -> AttributeKind = AttributeKind::DenyExplicitImpl;
70+
}

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ use crate::attributes::stability::{
4343
BodyStabilityParser, ConstStabilityIndirectParser, ConstStabilityParser, StabilityParser,
4444
};
4545
use crate::attributes::test_attrs::IgnoreParser;
46-
use crate::attributes::traits::{ConstTraitParser, SkipDuringMethodDispatchParser};
46+
use crate::attributes::traits::{
47+
ConstTraitParser, DenyExplicitImplParser, SkipDuringMethodDispatchParser,
48+
};
4749
use crate::attributes::transparency::TransparencyParser;
4850
use crate::attributes::{AttributeParser as _, Combine, Single, WithoutArgs};
4951
use crate::parser::{ArgParser, MetaItemParser, PathParser};
@@ -151,6 +153,7 @@ attribute_parsers!(
151153
Single<WithoutArgs<ConstContinueParser>>,
152154
Single<WithoutArgs<ConstStabilityIndirectParser>>,
153155
Single<WithoutArgs<ConstTraitParser>>,
156+
Single<WithoutArgs<DenyExplicitImplParser>>,
154157
Single<WithoutArgs<ExportStableParser>>,
155158
Single<WithoutArgs<FfiConstParser>>,
156159
Single<WithoutArgs<FfiPureParser>>,

compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::TraitDef {
961961
no_dups.then_some(list)
962962
});
963963

964-
let deny_explicit_impl = attrs.iter().any(|attr| attr.has_name(sym::rustc_deny_explicit_impl));
964+
let deny_explicit_impl = find_attr!(attrs, AttributeKind::DenyExplicitImpl(_));
965965
let implement_via_object =
966966
!attrs.iter().any(|attr| attr.has_name(sym::rustc_do_not_implement_via_object));
967967

compiler/rustc_parse/src/validate_attr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ pub fn check_builtin_meta_item(
283283
| sym::rustc_confusables
284284
| sym::rustc_skip_during_method_dispatch
285285
| sym::rustc_pass_by_value
286+
| sym::rustc_deny_explicit_impl
286287
| sym::const_trait
287288
| sym::repr
288289
| sym::align

compiler/rustc_passes/src/check_attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
122122
match attr {
123123
Attribute::Parsed(
124124
AttributeKind::SkipDuringMethodDispatch { span: attr_span, .. }
125-
| AttributeKind::ConstTrait(attr_span),
125+
| AttributeKind::ConstTrait(attr_span)
126+
| AttributeKind::DenyExplicitImpl(attr_span),
126127
) => {
127128
self.check_must_be_applied_to_trait(*attr_span, span, target);
128129
}
@@ -299,7 +300,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
299300
| [sym::rustc_then_this_would_need, ..] => self.check_rustc_dirty_clean(attr),
300301
[sym::rustc_coinductive, ..]
301302
| [sym::rustc_must_implement_one_of, ..]
302-
| [sym::rustc_deny_explicit_impl, ..]
303303
| [sym::rustc_do_not_implement_via_object, ..]
304304
=> self.check_must_be_applied_to_trait(attr.span(), span, target),
305305
[sym::collapse_debuginfo, ..] => self.check_collapse_debuginfo(attr, span, target),

0 commit comments

Comments
 (0)