Skip to content

Commit 7bade6e

Browse files
borsbors
committed
Auto merge of #77015 - davidtwco:check-attr-variant-closure-expr, r=lcnr
passes: `check_attr` on more targets This PR modifies `check_attr` so that: - Enum variants are now checked (some attributes would not have been prohibited on variants previously). - `check_expr_attributes` and `check_stmt_attributes` are removed as `check_attributes` can perform the same checks. This means that codegen attribute errors aren't shown if there are other errors first (e.g. from other attributes, as shown in `src/test/ui/macros/issue-68060.rs` changes below).
2 parents 07a63e6 + 57e8fc5 commit 7bade6e

20 files changed

+114
-131
lines changed

Diff for: ‎compiler/rustc_passes/src/check_attr.rs

+33-58
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl CheckAttrVisitor<'tcx> {
104104
return;
105105
}
106106

107-
if matches!(target, Target::Fn | Target::Method(_) | Target::ForeignFn) {
107+
if matches!(target, Target::Closure | Target::Fn | Target::Method(_) | Target::ForeignFn) {
108108
self.tcx.ensure().codegen_fn_attrs(self.tcx.hir().local_def_id(hir_id));
109109
}
110110

@@ -195,7 +195,7 @@ impl CheckAttrVisitor<'tcx> {
195195
/// Checks if the `#[non_exhaustive]` attribute on an `item` is valid. Returns `true` if valid.
196196
fn check_non_exhaustive(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
197197
match target {
198-
Target::Struct | Target::Enum => true,
198+
Target::Struct | Target::Enum | Target::Variant => true,
199199
_ => {
200200
struct_span_err!(
201201
self.tcx.sess,
@@ -587,6 +587,9 @@ impl CheckAttrVisitor<'tcx> {
587587

588588
for hint in &hints {
589589
let (article, allowed_targets) = match hint.name_or_empty() {
590+
_ if !matches!(target, Target::Struct | Target::Enum | Target::Union) => {
591+
("a", "struct, enum, or union")
592+
}
590593
name @ sym::C | name @ sym::align => {
591594
is_c |= name == sym::C;
592595
match target {
@@ -652,12 +655,16 @@ impl CheckAttrVisitor<'tcx> {
652655
}
653656
_ => continue,
654657
};
655-
self.emit_repr_error(
658+
659+
struct_span_err!(
660+
self.tcx.sess,
656661
hint.span(),
657-
*span,
658-
&format!("attribute should be applied to {}", allowed_targets),
659-
&format!("not {} {}", article, allowed_targets),
662+
E0517,
663+
"{}",
664+
&format!("attribute should be applied to {} {}", article, allowed_targets)
660665
)
666+
.span_label(*span, &format!("not {} {}", article, allowed_targets))
667+
.emit();
661668
}
662669

663670
// Just point at all repr hints if there are any incompatibilities.
@@ -703,56 +710,6 @@ impl CheckAttrVisitor<'tcx> {
703710
}
704711
}
705712

706-
fn emit_repr_error(
707-
&self,
708-
hint_span: Span,
709-
label_span: Span,
710-
hint_message: &str,
711-
label_message: &str,
712-
) {
713-
struct_span_err!(self.tcx.sess, hint_span, E0517, "{}", hint_message)
714-
.span_label(label_span, label_message)
715-
.emit();
716-
}
717-
718-
fn check_stmt_attributes(&self, stmt: &hir::Stmt<'_>) {
719-
// When checking statements ignore expressions, they will be checked later
720-
if let hir::StmtKind::Local(ref l) = stmt.kind {
721-
self.check_attributes(l.hir_id, &l.attrs, &stmt.span, Target::Statement, None);
722-
for attr in l.attrs.iter() {
723-
if self.tcx.sess.check_name(attr, sym::repr) {
724-
self.emit_repr_error(
725-
attr.span,
726-
stmt.span,
727-
"attribute should not be applied to a statement",
728-
"not a struct, enum, or union",
729-
);
730-
}
731-
}
732-
}
733-
}
734-
735-
fn check_expr_attributes(&self, expr: &hir::Expr<'_>) {
736-
let target = match expr.kind {
737-
hir::ExprKind::Closure(..) => Target::Closure,
738-
_ => Target::Expression,
739-
};
740-
self.check_attributes(expr.hir_id, &expr.attrs, &expr.span, target, None);
741-
for attr in expr.attrs.iter() {
742-
if self.tcx.sess.check_name(attr, sym::repr) {
743-
self.emit_repr_error(
744-
attr.span,
745-
expr.span,
746-
"attribute should not be applied to an expression",
747-
"not defining a struct, enum, or union",
748-
);
749-
}
750-
}
751-
if target == Target::Closure {
752-
self.tcx.ensure().codegen_fn_attrs(self.tcx.hir().local_def_id(expr.hir_id));
753-
}
754-
}
755-
756713
fn check_used(&self, attrs: &'hir [Attribute], target: Target) {
757714
for attr in attrs {
758715
if self.tcx.sess.check_name(attr, sym::used) && target != Target::Static {
@@ -808,14 +765,32 @@ impl Visitor<'tcx> for CheckAttrVisitor<'tcx> {
808765
}
809766

810767
fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
811-
self.check_stmt_attributes(stmt);
768+
// When checking statements ignore expressions, they will be checked later.
769+
if let hir::StmtKind::Local(ref l) = stmt.kind {
770+
self.check_attributes(l.hir_id, &l.attrs, &stmt.span, Target::Statement, None);
771+
}
812772
intravisit::walk_stmt(self, stmt)
813773
}
814774

815775
fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
816-
self.check_expr_attributes(expr);
776+
let target = match expr.kind {
777+
hir::ExprKind::Closure(..) => Target::Closure,
778+
_ => Target::Expression,
779+
};
780+
781+
self.check_attributes(expr.hir_id, &expr.attrs, &expr.span, target, None);
817782
intravisit::walk_expr(self, expr)
818783
}
784+
785+
fn visit_variant(
786+
&mut self,
787+
variant: &'tcx hir::Variant<'tcx>,
788+
generics: &'tcx hir::Generics<'tcx>,
789+
item_id: HirId,
790+
) {
791+
self.check_attributes(variant.id, variant.attrs, &variant.span, Target::Variant, None);
792+
intravisit::walk_variant(self, variant, generics, item_id)
793+
}
819794
}
820795

821796
fn is_c_like_enum(item: &Item<'_>) -> bool {

Diff for: ‎src/test/ui/attr-usage-repr.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![feature(repr_simd)]
22

3-
#[repr(C)] //~ ERROR: attribute should be applied to struct, enum, or union
3+
#[repr(C)] //~ ERROR: attribute should be applied to a struct, enum, or union
44
fn f() {}
55

66
#[repr(C)]
@@ -12,7 +12,7 @@ struct SPacked(f64, f64);
1212
#[repr(simd)]
1313
struct SSimd(f64, f64);
1414

15-
#[repr(i8)] //~ ERROR: attribute should be applied to enum
15+
#[repr(i8)] //~ ERROR: attribute should be applied to an enum
1616
struct SInt(f64, f64);
1717

1818
#[repr(C)]
@@ -21,10 +21,10 @@ enum EExtern { A, B }
2121
#[repr(align(8))]
2222
enum EAlign { A, B }
2323

24-
#[repr(packed)] //~ ERROR: attribute should be applied to struct
24+
#[repr(packed)] //~ ERROR: attribute should be applied to a struct
2525
enum EPacked { A, B }
2626

27-
#[repr(simd)] //~ ERROR: attribute should be applied to struct
27+
#[repr(simd)] //~ ERROR: attribute should be applied to a struct
2828
enum ESimd { A, B }
2929

3030
#[repr(i8)]

Diff for: ‎src/test/ui/attr-usage-repr.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
error[E0517]: attribute should be applied to struct, enum, or union
1+
error[E0517]: attribute should be applied to a struct, enum, or union
22
--> $DIR/attr-usage-repr.rs:3:8
33
|
44
LL | #[repr(C)]
55
| ^
66
LL | fn f() {}
77
| --------- not a struct, enum, or union
88

9-
error[E0517]: attribute should be applied to enum
9+
error[E0517]: attribute should be applied to an enum
1010
--> $DIR/attr-usage-repr.rs:15:8
1111
|
1212
LL | #[repr(i8)]
1313
| ^^
1414
LL | struct SInt(f64, f64);
1515
| ---------------------- not an enum
1616

17-
error[E0517]: attribute should be applied to struct or union
17+
error[E0517]: attribute should be applied to a struct or union
1818
--> $DIR/attr-usage-repr.rs:24:8
1919
|
2020
LL | #[repr(packed)]
2121
| ^^^^^^
2222
LL | enum EPacked { A, B }
2323
| --------------------- not a struct or union
2424

25-
error[E0517]: attribute should be applied to struct
25+
error[E0517]: attribute should be applied to a struct
2626
--> $DIR/attr-usage-repr.rs:27:8
2727
|
2828
LL | #[repr(simd)]

Diff for: ‎src/test/ui/error-codes/E0517.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
error[E0517]: attribute should be applied to struct, enum, or union
1+
error[E0517]: attribute should be applied to a struct, enum, or union
22
--> $DIR/E0517.rs:1:8
33
|
44
LL | #[repr(C)]
55
| ^
66
LL | type Foo = u8;
77
| -------------- not a struct, enum, or union
88

9-
error[E0517]: attribute should be applied to struct or union
9+
error[E0517]: attribute should be applied to a struct or union
1010
--> $DIR/E0517.rs:4:8
1111
|
1212
LL | #[repr(packed)]
1313
| ^^^^^^
1414
LL | enum Foo2 {Bar, Baz}
1515
| -------------------- not a struct or union
1616

17-
error[E0517]: attribute should be applied to enum
17+
error[E0517]: attribute should be applied to an enum
1818
--> $DIR/E0517.rs:7:8
1919
|
2020
LL | #[repr(u8)]
2121
| ^^
2222
LL | struct Foo3 {bar: bool, baz: bool}
2323
| ---------------------------------- not an enum
2424

25-
error[E0517]: attribute should be applied to struct, enum, or union
25+
error[E0517]: attribute should be applied to a struct, enum, or union
2626
--> $DIR/E0517.rs:10:8
2727
|
2828
LL | #[repr(C)]

Diff for: ‎src/test/ui/inline-disallow-on-variant.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
enum Foo {
2+
#[inline]
3+
//~^ ERROR attribute should be applied
4+
Variant,
5+
}
6+
7+
fn main() {}

Diff for: ‎src/test/ui/inline-disallow-on-variant.stderr

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
error[E0518]: attribute should be applied to function or closure
2+
--> $DIR/inline-disallow-on-variant.rs:2:5
3+
|
4+
LL | #[inline]
5+
| ^^^^^^^^^
6+
LL |
7+
LL | Variant,
8+
| ------- not a function or closure
9+
10+
error: aborting due to previous error
11+
12+
For more information about this error, try `rustc --explain E0518`.

Diff for: ‎src/test/ui/issues/issue-31769.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fn main() {
22
#[inline] struct Foo; //~ ERROR attribute should be applied to function or closure
3-
#[repr(C)] fn foo() {} //~ ERROR attribute should be applied to struct, enum, or union
3+
#[repr(C)] fn foo() {} //~ ERROR attribute should be applied to a struct, enum, or union
44
}

Diff for: ‎src/test/ui/issues/issue-31769.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0518]: attribute should be applied to function or closure
44
LL | #[inline] struct Foo;
55
| ^^^^^^^^^ ----------- not a function or closure
66

7-
error[E0517]: attribute should be applied to struct, enum, or union
7+
error[E0517]: attribute should be applied to a struct, enum, or union
88
--> $DIR/issue-31769.rs:3:12
99
|
1010
LL | #[repr(C)] fn foo() {}

Diff for: ‎src/test/ui/issues/issue-43988.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@ fn main() {
1313

1414
#[repr(nothing)]
1515
let _x = 0;
16-
//~^^ ERROR attribute should not be applied to a statement
16+
//~^^ ERROR attribute should be applied to a struct, enum, or union
1717

1818
#[repr(something_not_real)]
1919
loop {
2020
()
2121
};
22-
//~^^^^ ERROR attribute should not be applied to an expression
22+
//~^^^^ ERROR attribute should be applied to a struct, enum, or union
2323

2424
#[repr]
2525
let _y = "123";
26-
//~^^ ERROR attribute should not be applied to a statement
27-
//~| ERROR malformed `repr` attribute
26+
//~^^ ERROR malformed `repr` attribute
2827

2928
fn foo() {}
3029

@@ -33,6 +32,5 @@ fn main() {
3332
//~^^ ERROR attribute should be applied to function or closure
3433

3534
let _z = #[repr] 1;
36-
//~^ ERROR attribute should not be applied to an expression
37-
//~| ERROR malformed `repr` attribute
35+
//~^ ERROR malformed `repr` attribute
3836
}

Diff for: ‎src/test/ui/issues/issue-43988.stderr

+10-24
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | #[repr]
55
| ^^^^^^^ help: must be of the form: `#[repr(C)]`
66

77
error: malformed `repr` attribute input
8-
--> $DIR/issue-43988.rs:35:14
8+
--> $DIR/issue-43988.rs:34:14
99
|
1010
LL | let _z = #[repr] 1;
1111
| ^^^^^^^ help: must be of the form: `#[repr(C)]`
@@ -26,47 +26,33 @@ LL | #[inline(XYZ)]
2626
LL | let _b = 4;
2727
| ----------- not a function or closure
2828

29-
error[E0517]: attribute should not be applied to a statement
30-
--> $DIR/issue-43988.rs:14:5
29+
error[E0517]: attribute should be applied to a struct, enum, or union
30+
--> $DIR/issue-43988.rs:14:12
3131
|
3232
LL | #[repr(nothing)]
33-
| ^^^^^^^^^^^^^^^^
33+
| ^^^^^^^
3434
LL | let _x = 0;
3535
| ----------- not a struct, enum, or union
3636

37-
error[E0517]: attribute should not be applied to an expression
38-
--> $DIR/issue-43988.rs:18:5
37+
error[E0517]: attribute should be applied to a struct, enum, or union
38+
--> $DIR/issue-43988.rs:18:12
3939
|
4040
LL | #[repr(something_not_real)]
41-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
41+
| ^^^^^^^^^^^^^^^^^^
4242
LL | / loop {
4343
LL | | ()
4444
LL | | };
45-
| |_____- not defining a struct, enum, or union
46-
47-
error[E0517]: attribute should not be applied to a statement
48-
--> $DIR/issue-43988.rs:24:5
49-
|
50-
LL | #[repr]
51-
| ^^^^^^^
52-
LL | let _y = "123";
53-
| --------------- not a struct, enum, or union
45+
| |_____- not a struct, enum, or union
5446

5547
error[E0518]: attribute should be applied to function or closure
56-
--> $DIR/issue-43988.rs:31:5
48+
--> $DIR/issue-43988.rs:30:5
5749
|
5850
LL | #[inline(ABC)]
5951
| ^^^^^^^^^^^^^^
6052
LL | foo();
6153
| ----- not a function or closure
6254

63-
error[E0517]: attribute should not be applied to an expression
64-
--> $DIR/issue-43988.rs:35:14
65-
|
66-
LL | let _z = #[repr] 1;
67-
| ^^^^^^^ - not defining a struct, enum, or union
68-
69-
error: aborting due to 9 previous errors
55+
error: aborting due to 7 previous errors
7056

7157
Some errors have detailed explanations: E0517, E0518.
7258
For more information about an error, try `rustc --explain E0517`.

Diff for: ‎src/test/ui/issues/issue-74082.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![allow(dead_code)]
22

3-
#[repr(i128)] //~ ERROR: attribute should be applied to enum
3+
#[repr(i128)] //~ ERROR: attribute should be applied to an enum
44
struct Foo;
55

6-
#[repr(u128)] //~ ERROR: attribute should be applied to enum
6+
#[repr(u128)] //~ ERROR: attribute should be applied to an enum
77
struct Bar;
88

99
fn main() {}

Diff for: ‎src/test/ui/issues/issue-74082.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
error[E0517]: attribute should be applied to enum
1+
error[E0517]: attribute should be applied to an enum
22
--> $DIR/issue-74082.rs:3:8
33
|
44
LL | #[repr(i128)]
55
| ^^^^
66
LL | struct Foo;
77
| ----------- not an enum
88

9-
error[E0517]: attribute should be applied to enum
9+
error[E0517]: attribute should be applied to an enum
1010
--> $DIR/issue-74082.rs:6:8
1111
|
1212
LL | #[repr(u128)]

0 commit comments

Comments
 (0)