Skip to content

Commit

Permalink
Unrolled build for rust-lang#117092
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#117092 - matthewjasper:attribute-validation, r=compiler-errors

Add regression test for rust-lang#117058

The new behavior in nightly is correct, so add a test that it stays this way.

Closes rust-lang#117058
  • Loading branch information
rust-timer authored Oct 24, 2023
2 parents 07a4b7e + 712106b commit 4879ad1
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 0 deletions.
39 changes: 39 additions & 0 deletions tests/ui/attributes/statement-attribute-validation.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// test for #117058 - check that attributes are validated on various kinds of statements.

struct A;

fn func() {}

fn main() {
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
if true {
} else {
}
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
(1);
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
match 1 {
_ => {}
}
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
while false {}
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
{}
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
A {};
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
func();
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
A;
#[allow(two-words)]
//~^ ERROR expected one of `(`, `,`, `::`, or `=`, found `-`
loop {}
}
56 changes: 56 additions & 0 deletions tests/ui/attributes/statement-attribute-validation.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:8:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:13:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:16:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:21:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:24:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:27:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:30:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:33:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: expected one of `(`, `,`, `::`, or `=`, found `-`
--> $DIR/statement-attribute-validation.rs:36:16
|
LL | #[allow(two-words)]
| ^ expected one of `(`, `,`, `::`, or `=`

error: aborting due to 9 previous errors

0 comments on commit 4879ad1

Please sign in to comment.