Skip to content

Commit dda1ea0

Browse files
fmeaseJonathanBrouwer
authored andcommitted
Rename #[rustc_hidden_type_of_opaques] to #[rustc_dump_hidden_type_of_opaques]
1 parent 7025605 commit dda1ea0

12 files changed

Lines changed: 21 additions & 20 deletions

File tree

compiler/rustc_attr_parsing/src/attributes/rustc_dump.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ impl<S: Stage> NoArgsAttributeParser<S> for RustcDumpDefParentsParser {
2424
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcDumpDefParents;
2525
}
2626

27+
pub(crate) struct RustcDumpHiddenTypeOfOpaquesParser;
28+
29+
impl<S: Stage> NoArgsAttributeParser<S> for RustcDumpHiddenTypeOfOpaquesParser {
30+
const PATH: &[Symbol] = &[sym::rustc_dump_hidden_type_of_opaques];
31+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
32+
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
33+
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcDumpHiddenTypeOfOpaques;
34+
}
35+
2736
pub(crate) struct RustcDumpInferredOutlivesParser;
2837

2938
impl<S: Stage> NoArgsAttributeParser<S> for RustcDumpInferredOutlivesParser {

compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -680,14 +680,6 @@ impl<S: Stage> NoArgsAttributeParser<S> for PanicHandlerParser {
680680
const CREATE: fn(Span) -> AttributeKind = |span| AttributeKind::Lang(LangItem::PanicImpl, span);
681681
}
682682

683-
pub(crate) struct RustcHiddenTypeOfOpaquesParser;
684-
685-
impl<S: Stage> NoArgsAttributeParser<S> for RustcHiddenTypeOfOpaquesParser {
686-
const PATH: &[Symbol] = &[sym::rustc_hidden_type_of_opaques];
687-
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
688-
const ALLOWED_TARGETS: AllowedTargets = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
689-
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::RustcHiddenTypeOfOpaques;
690-
}
691683
pub(crate) struct RustcNounwindParser;
692684

693685
impl<S: Stage> NoArgsAttributeParser<S> for RustcNounwindParser {

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ attribute_parsers!(
285285
Single<WithoutArgs<RustcDenyExplicitImplParser>>,
286286
Single<WithoutArgs<RustcDoNotConstCheckParser>>,
287287
Single<WithoutArgs<RustcDumpDefParentsParser>>,
288+
Single<WithoutArgs<RustcDumpHiddenTypeOfOpaquesParser>>,
288289
Single<WithoutArgs<RustcDumpInferredOutlivesParser>>,
289290
Single<WithoutArgs<RustcDumpItemBoundsParser>>,
290291
Single<WithoutArgs<RustcDumpObjectLifetimeDefaultsParser>>,
@@ -298,7 +299,6 @@ attribute_parsers!(
298299
Single<WithoutArgs<RustcEiiForeignItemParser>>,
299300
Single<WithoutArgs<RustcEvaluateWhereClausesParser>>,
300301
Single<WithoutArgs<RustcHasIncoherentInherentImplsParser>>,
301-
Single<WithoutArgs<RustcHiddenTypeOfOpaquesParser>>,
302302
Single<WithoutArgs<RustcInheritOverflowChecksParser>>,
303303
Single<WithoutArgs<RustcInsignificantDtorParser>>,
304304
Single<WithoutArgs<RustcIntrinsicConstStableIndirectParser>>,

compiler/rustc_feature/src/builtin_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
14491449
WarnFollowing, EncodeCrossCrate::No
14501450
),
14511451
rustc_attr!(
1452-
TEST, rustc_hidden_type_of_opaques, Normal, template!(Word),
1452+
TEST, rustc_dump_hidden_type_of_opaques, Normal, template!(Word),
14531453
WarnFollowing, EncodeCrossCrate::No
14541454
),
14551455
rustc_attr!(

compiler/rustc_hir/src/attrs/data_structures.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,6 +1371,9 @@ pub enum AttributeKind {
13711371
/// Represents `#[rustc_dump_def_parents]`
13721372
RustcDumpDefParents,
13731373

1374+
/// Represents `#[rustc_dump_hidden_type_of_opaques]`
1375+
RustcDumpHiddenTypeOfOpaques,
1376+
13741377
/// Represents `#[rustc_dump_inferred_outlives]`
13751378
RustcDumpInferredOutlives,
13761379

@@ -1412,9 +1415,6 @@ pub enum AttributeKind {
14121415

14131416
RustcHasIncoherentInherentImpls,
14141417

1415-
/// Represents `#[rustc_hidden_type_of_opaques]`
1416-
RustcHiddenTypeOfOpaques,
1417-
14181418
/// Represents `#[rustc_if_this_changed]`
14191419
RustcIfThisChanged(Span, Option<Symbol>),
14201420

compiler/rustc_hir/src/attrs/encode_cross_crate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ impl AttributeKind {
125125
RustcDocPrimitive(..) => Yes,
126126
RustcDummy => No,
127127
RustcDumpDefParents => No,
128+
RustcDumpHiddenTypeOfOpaques => No,
128129
RustcDumpInferredOutlives => No,
129130
RustcDumpItemBounds => No,
130131
RustcDumpLayout(..) => No,
@@ -139,7 +140,6 @@ impl AttributeKind {
139140
RustcEiiForeignItem => No,
140141
RustcEvaluateWhereClauses => Yes,
141142
RustcHasIncoherentInherentImpls => Yes,
142-
RustcHiddenTypeOfOpaques => No,
143143
RustcIfThisChanged(..) => No,
144144
RustcInheritOverflowChecks => No,
145145
RustcInsignificantDtor => Yes,

compiler/rustc_hir_analysis/src/collect/dump.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_middle::ty::{self, TyCtxt, TypeVisitableExt};
77
use rustc_span::sym;
88

99
pub(crate) fn opaque_hidden_types(tcx: TyCtxt<'_>) {
10-
if !find_attr!(tcx, crate, RustcHiddenTypeOfOpaques) {
10+
if !find_attr!(tcx, crate, RustcDumpHiddenTypeOfOpaques) {
1111
return;
1212
}
1313
for id in tcx.hir_crate_items(()).opaques() {

compiler/rustc_passes/src/check_attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
311311
| AttributeKind::RustcDocPrimitive(..)
312312
| AttributeKind::RustcDummy
313313
| AttributeKind::RustcDumpDefParents
314+
| AttributeKind::RustcDumpHiddenTypeOfOpaques
314315
| AttributeKind::RustcDumpInferredOutlives
315316
| AttributeKind::RustcDumpItemBounds
316317
| AttributeKind::RustcDumpLayout(..)
@@ -324,7 +325,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
324325
| AttributeKind::RustcEiiForeignItem
325326
| AttributeKind::RustcEvaluateWhereClauses
326327
| AttributeKind::RustcHasIncoherentInherentImpls
327-
| AttributeKind::RustcHiddenTypeOfOpaques
328328
| AttributeKind::RustcIfThisChanged(..)
329329
| AttributeKind::RustcInheritOverflowChecks
330330
| AttributeKind::RustcInsignificantDtor

compiler/rustc_span/src/symbol.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1721,6 +1721,7 @@ symbols! {
17211721
rustc_driver,
17221722
rustc_dummy,
17231723
rustc_dump_def_parents,
1724+
rustc_dump_hidden_type_of_opaques,
17241725
rustc_dump_inferred_outlives,
17251726
rustc_dump_item_bounds,
17261727
rustc_dump_layout,
@@ -1737,7 +1738,6 @@ symbols! {
17371738
rustc_expected_cgu_reuse,
17381739
rustc_force_inline,
17391740
rustc_has_incoherent_inherent_impls,
1740-
rustc_hidden_type_of_opaques,
17411741
rustc_if_this_changed,
17421742
rustc_inherit_overflow_checks,
17431743
rustc_insignificant_dtor,

src/doc/rustc-dev-guide/src/compiler-debugging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,14 @@ Here are some notable ones:
275275
|----------------|-------------|
276276
| `rustc_def_path` | Dumps the [`def_path_str`] of an item. |
277277
| `rustc_dump_def_parents` | Dumps the chain of `DefId` parents of certain definitions. |
278+
| `rustc_dump_hidden_type_of_opaques` | Dumps the [hidden type of each opaque types][opaq] in the crate. |
278279
| `rustc_dump_inferred_outlives` | Dumps implied bounds of an item. More precisely, the [`inferred_outlives_of`] an item. |
279280
| `rustc_dump_item_bounds` | Dumps the [`item_bounds`] of an item. |
280281
| `rustc_dump_layout` | [See this section](#debugging-type-layouts). |
281282
| `rustc_dump_object_lifetime_defaults` | Dumps the [object lifetime defaults] of an item. |
282283
| `rustc_dump_predicates` | Dumps the [`predicates_of`] an item. |
283284
| `rustc_dump_variances` | Dumps the [variances] of an item. |
284285
| `rustc_dump_vtable` | Dumps the vtable layout of an impl, or a type alias of a dyn type. |
285-
| `rustc_hidden_type_of_opaques` | Dumps the [hidden type of each opaque types][opaq] in the crate. |
286286
| `rustc_regions` | Dumps NLL closure region requirements. |
287287
| `rustc_symbol_name` | Dumps the mangled & demangled [`symbol_name`] of an item. |
288288

0 commit comments

Comments
 (0)