Skip to content

Commit b9e3095

Browse files
committed
Port #[rustc_pub_transparent] to the new attribute system
1 parent 9c4ff56 commit b9e3095

File tree

6 files changed

+29
-5
lines changed

6 files changed

+29
-5
lines changed

compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,13 @@ pub enum AttributeKind {
230230

231231
/// Represents `#[rustc_macro_transparency]`.
232232
MacroTransparency(Transparency),
233+
233234
/// Represents `#[optimize(size|speed)]`
234235
Optimize(OptimizeAttr, Span),
236+
237+
/// Represents `#[rustc_pub_transparent]` (used by the `repr_transparent_external_private_fields` lint).
238+
PubTransparent(Span),
239+
235240
/// Represents [`#[repr]`](https://doc.rust-lang.org/stable/reference/type-layout.html#representations).
236241
Repr(ThinVec<(ReprAttr, Span)>),
237242

compiler/rustc_attr_parsing/src/attributes/lint_helpers.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,18 @@ impl<S: Stage> SingleAttributeParser<S> for AsPtrParser {
1515
const TEMPLATE: AttributeTemplate = template!(Word);
1616

1717
fn convert(cx: &mut AcceptContext<'_, '_, S>, _args: &ArgParser<'_>) -> Option<AttributeKind> {
18-
// FIXME: check that there's no args (this is currently checked elsewhere)
1918
Some(AttributeKind::AsPtr(cx.attr_span))
2019
}
2120
}
21+
22+
pub(crate) struct PubTransparentParser;
23+
impl<S: Stage> SingleAttributeParser<S> for PubTransparentParser {
24+
const PATH: &[Symbol] = &[sym::rustc_pub_transparent];
25+
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepFirst;
26+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
27+
const TEMPLATE: AttributeTemplate = template!(Word);
28+
29+
fn convert(cx: &mut AcceptContext<'_, '_, S>, _args: &ArgParser<'_>) -> Option<AttributeKind> {
30+
Some(AttributeKind::PubTransparent(cx.attr_span))
31+
}
32+
}

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::attributes::codegen_attrs::OptimizeParser;
1919
use crate::attributes::confusables::ConfusablesParser;
2020
use crate::attributes::deprecation::DeprecationParser;
2121
use crate::attributes::inline::{InlineParser, RustcForceInlineParser};
22-
use crate::attributes::lint_helpers::AsPtrParser;
22+
use crate::attributes::lint_helpers::{AsPtrParser, PubTransparentParser};
2323
use crate::attributes::repr::{AlignParser, ReprParser};
2424
use crate::attributes::stability::{
2525
BodyStabilityParser, ConstStabilityIndirectParser, ConstStabilityParser, StabilityParser,
@@ -110,6 +110,7 @@ attribute_parsers!(
110110
Single<DeprecationParser>,
111111
Single<InlineParser>,
112112
Single<OptimizeParser>,
113+
Single<PubTransparentParser>,
113114
Single<RustcForceInlineParser>,
114115
Single<TransparencyParser>,
115116
// tidy-alphabetical-end

compiler/rustc_feature/src/builtin_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
710710
),
711711
rustc_attr!(
712712
rustc_pub_transparent, Normal, template!(Word),
713-
WarnFollowing, EncodeCrossCrate::Yes,
713+
ErrorFollowing, EncodeCrossCrate::Yes,
714714
"used internally to mark types with a `transparent` representation when it is guaranteed by the documentation",
715715
),
716716

compiler/rustc_hir_analysis/src/check/check.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::cell::LazyCell;
22
use std::ops::ControlFlow;
33

44
use rustc_abi::FieldIdx;
5+
use rustc_attr_data_structures::AttributeKind;
56
use rustc_attr_data_structures::ReprAttr::ReprPacked;
67
use rustc_data_structures::unord::{UnordMap, UnordSet};
78
use rustc_errors::codes::*;
@@ -1384,7 +1385,11 @@ pub(super) fn check_transparent<'tcx>(tcx: TyCtxt<'tcx>, adt: ty::AdtDef<'tcx>)
13841385
ty::Tuple(list) => list.iter().try_for_each(|t| check_non_exhaustive(tcx, t)),
13851386
ty::Array(ty, _) => check_non_exhaustive(tcx, *ty),
13861387
ty::Adt(def, args) => {
1387-
if !def.did().is_local() && !tcx.has_attr(def.did(), sym::rustc_pub_transparent)
1388+
if !def.did().is_local()
1389+
&& !attrs::find_attr!(
1390+
tcx.get_all_attrs(def.did()),
1391+
AttributeKind::PubTransparent(_)
1392+
)
13881393
{
13891394
let non_exhaustive = def.is_variant_list_non_exhaustive()
13901395
|| def

compiler/rustc_passes/src/check_attr.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
149149
}
150150
Attribute::Parsed(AttributeKind::Repr(_)) => { /* handled below this loop and elsewhere */
151151
}
152+
&Attribute::Parsed(AttributeKind::PubTransparent(attr_span)) => {
153+
self.check_rustc_pub_transparent(attr_span, span, attrs)
154+
}
152155
Attribute::Parsed(AttributeKind::Align { align, span: repr_span }) => {
153156
self.check_align(span, target, *align, *repr_span)
154157
}
@@ -285,7 +288,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
285288
self.check_type_const(hir_id,attr, target);
286289
}
287290
[sym::linkage, ..] => self.check_linkage(attr, span, target),
288-
[sym::rustc_pub_transparent, ..] => self.check_rustc_pub_transparent(attr.span(), span, attrs),
289291
[
290292
// ok
291293
sym::allow

0 commit comments

Comments
 (0)