Skip to content

Commit 747e670

Browse files
committed
fix tidy, sorry its annoying to squash into the other commits nicely
1 parent 4b31d72 commit 747e670

4 files changed

Lines changed: 12 additions & 6 deletions

File tree

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ attribute_parsers!(
147147
DocParser,
148148
MacroUseParser,
149149
NakedParser,
150+
RustcCguTestAttributeParser,
150151
StabilityParser,
151152
UsedParser,
152-
RustcCguTestAttributeParser,
153153
// tidy-alphabetical-end
154154

155155
// tidy-alphabetical-start

compiler/rustc_hir/src/attrs/data_structures.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,15 @@ pub enum AttributeKind {
11071107
/// Represents `#[rustc_capture_analysis]`
11081108
RustcCaptureAnalysis,
11091109

1110+
/// Represents `#[rustc_expected_cgu_reuse]`, `#[rustc_partition_codegened]` and `#[rustc_partition_reused]`.
1111+
RustcCguTestAttr(ThinVec<(Span, CguFields)>),
1112+
1113+
/// Represents `#[rustc_expected_cgu_reuse]`, `#[rustc_partition_codegened]` and `#[rustc_partition_reused]`.
1114+
RustcCguTestAttr(ThinVec<(Span, CguFields)>),
1115+
1116+
/// Represents `#[rustc_expected_cgu_reuse]`, `#[rustc_partition_codegened]` and `#[rustc_partition_reused]`.
1117+
RustcCguTestAttr(ThinVec<(Span, CguFields)>),
1118+
11101119
/// Represents `#[rustc_clean]`
11111120
RustcClean(ThinVec<RustcCleanAttribute>),
11121121

@@ -1177,9 +1186,6 @@ pub enum AttributeKind {
11771186
/// Represents `#[rustc_evaluate_where_clauses]`
11781187
RustcEvaluateWhereClauses,
11791188

1180-
/// Represents `#[rustc_expected_cgu_reuse]`, `#[rustc_partition_codegened]` and `#[rustc_partition_reused]`.
1181-
RustcCguTestAttr(ThinVec<(Span, CguFields)>),
1182-
11831189
/// Represents `#[rustc_has_incoherent_inherent_impls]`
11841190
RustcHasIncoherentInherentImpls,
11851191

compiler/rustc_hir/src/attrs/encode_cross_crate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ impl AttributeKind {
9999
RustcBodyStability { .. } => No,
100100
RustcBuiltinMacro { .. } => Yes,
101101
RustcCaptureAnalysis => No,
102+
RustcCguTestAttr { .. } => No,
102103
RustcClean { .. } => No,
103104
RustcCoherenceIsCore(..) => No,
104105
RustcCoinductive(..) => No,
@@ -149,7 +150,6 @@ impl AttributeKind {
149150
RustcOffloadKernel => Yes,
150151
RustcOutlives => No,
151152
RustcParenSugar(..) => No,
152-
RustcCguTestAttr { .. } => No,
153153
RustcPassByValue(..) => Yes,
154154
RustcPassIndirectlyInNonRusticAbis(..) => No,
155155
RustcPreserveUbChecks => No,

compiler/rustc_passes/src/check_attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
295295
| AttributeKind::RustcBodyStability { .. }
296296
| AttributeKind::RustcBuiltinMacro { .. }
297297
| AttributeKind::RustcCaptureAnalysis
298+
| AttributeKind::RustcCguTestAttr(..)
298299
| AttributeKind::RustcClean(..)
299300
| AttributeKind::RustcCoherenceIsCore(..)
300301
| AttributeKind::RustcCoinductive(..)
@@ -341,7 +342,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
341342
| AttributeKind::RustcOffloadKernel
342343
| AttributeKind::RustcOutlives
343344
| AttributeKind::RustcParenSugar(..)
344-
| AttributeKind::RustcCguTestAttr(..)
345345
| AttributeKind::RustcPassByValue (..)
346346
| AttributeKind::RustcPassIndirectlyInNonRusticAbis(..)
347347
| AttributeKind::RustcPreserveUbChecks

0 commit comments

Comments
 (0)