Add test for enum with fields

Centri3 · Centri3 · commit bbd69e4a4c27 · 2023-08-02T23:59:30.000Z
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1754,12 +1754,7 @@ impl<'a> Parser<'a> {
                     ident: None,
                     vis,
                     id: DUMMY_NODE_ID,
-                    ty: P(Ty {
-                        id: DUMMY_NODE_ID,
-                        kind: TyKind::Err,
-                        span: DUMMY_SP,
-                        tokens: None,
-                    }),
+                    ty: self.mk_ty(DUMMY_SP, TyKind::Err),
                     attrs,
                     is_placeholder: false,
                 });
diff --git a/tests/ui/parser/macro/macro-expand-to-field.rs b/tests/ui/parser/macro/macro-expand-to-field.rs
@@ -1,4 +1,4 @@
-#![no_main]
+// compile-flags: --crate-type=lib
 
 macro_rules! field {
     ($name:ident:$type:ty) => {
@@ -13,9 +13,10 @@ macro_rules! variant {
 }
 
 struct Struct {
-    field!(bar:u128), //~ NOTE macros cannot expand to struct fields
-    //~^ ERROR unexpected token: `!`
-    //~^^ NOTE unexpected token after this
+    field!(bar:u128),
+    //~^ NOTE macros cannot expand to struct fields
+    //~| ERROR unexpected token: `!`
+    //~| NOTE unexpected token after this
     a: u32,
     b: u32,
     field!(recovers:()), //~ NOTE macros cannot expand to struct fields
@@ -24,34 +25,46 @@ struct Struct {
 }
 
 enum EnumVariant {
-    variant!(whoops), //~ NOTE macros cannot expand to enum variants
-    //~^ ERROR unexpected token: `!`
-    //~^^ NOTE unexpected token after this
+    variant!(whoops),
+    //~^ NOTE macros cannot expand to enum variants
+    //~| ERROR unexpected token: `!`
+    //~| NOTE unexpected token after this
     U32,
     F64,
-    variant!(recovers), //~ NOTE macros cannot expand to enum variants
-    //~^ ERROR unexpected token: `!`
-    //~^^ NOTE unexpected token after this
+    variant!(recovers),
+    //~^ NOTE macros cannot expand to enum variants
+    //~| ERROR unexpected token: `!`
+    //~| NOTE unexpected token after this
+    Data {
+        field!(x:u32),
+        //~^ NOTE macros cannot expand to struct fields
+        //~| ERROR unexpected token: `!`
+        //~| NOTE unexpected token after this
+    }
 }
 
 enum EnumVariantField {
     Named {
-        field!(oopsies:()), //~ NOTE macros cannot expand to struct fields
-        //~^ ERROR unexpected token: `!`
-        //~^^ unexpected token after this
-        field!(oopsies2:()), //~ NOTE macros cannot expand to struct fields
-        //~^ ERROR unexpected token: `!`
-        //~^^ unexpected token after this
+        field!(oopsies:()),
+        //~^ NOTE macros cannot expand to struct fields
+        //~| ERROR unexpected token: `!`
+        //~| unexpected token after this
+        field!(oopsies2:()),
+        //~^ NOTE macros cannot expand to struct fields
+        //~| ERROR unexpected token: `!`
+        //~| unexpected token after this
     },
 }
 
 union Union {
     A: u32,
-    field!(oopsies:()), //~ NOTE macros cannot expand to union fields
-    //~^ ERROR unexpected token: `!`
-    //~^^ unexpected token after this
+    field!(oopsies:()),
+    //~^ NOTE macros cannot expand to union fields
+    //~| ERROR unexpected token: `!`
+    //~| unexpected token after this
     B: u32,
-    field!(recovers:()), //~ NOTE macros cannot expand to union fields
-    //~^ ERROR unexpected token: `!`
-    //~^^ unexpected token after this
+    field!(recovers:()),
+    //~^ NOTE macros cannot expand to union fields
+    //~| ERROR unexpected token: `!`
+    //~| unexpected token after this
 }
diff --git a/tests/ui/parser/macro/macro-expand-to-field.stderr b/tests/ui/parser/macro/macro-expand-to-field.stderr
@@ -7,23 +7,23 @@ LL |     field!(bar:u128),
    = note: macros cannot expand to struct fields
 
 error: unexpected token: `!`
-  --> $DIR/macro-expand-to-field.rs:21:10
+  --> $DIR/macro-expand-to-field.rs:22:10
    |
 LL |     field!(recovers:()),
    |          ^ unexpected token after this
    |
    = note: macros cannot expand to struct fields
 
 error: unexpected token: `!`
-  --> $DIR/macro-expand-to-field.rs:27:12
+  --> $DIR/macro-expand-to-field.rs:28:12
    |
 LL |     variant!(whoops),
    |            ^ unexpected token after this
    |
    = note: macros cannot expand to enum variants
 
 error: unexpected token: `!`
-  --> $DIR/macro-expand-to-field.rs:32:12
+  --> $DIR/macro-expand-to-field.rs:34:12
    |
 LL |     variant!(recovers),
    |            ^ unexpected token after this
@@ -33,34 +33,42 @@ LL |     variant!(recovers),
 error: unexpected token: `!`
   --> $DIR/macro-expand-to-field.rs:39:14
    |
+LL |         field!(x:u32),
+   |              ^ unexpected token after this
+   |
+   = note: macros cannot expand to struct fields
+
+error: unexpected token: `!`
+  --> $DIR/macro-expand-to-field.rs:48:14
+   |
 LL |         field!(oopsies:()),
    |              ^ unexpected token after this
    |
    = note: macros cannot expand to struct fields
 
 error: unexpected token: `!`
-  --> $DIR/macro-expand-to-field.rs:42:14
+  --> $DIR/macro-expand-to-field.rs:52:14
    |
 LL |         field!(oopsies2:()),
    |              ^ unexpected token after this
    |
    = note: macros cannot expand to struct fields
 
 error: unexpected token: `!`
-  --> $DIR/macro-expand-to-field.rs:50:10
+  --> $DIR/macro-expand-to-field.rs:61:10
    |
 LL |     field!(oopsies:()),
    |          ^ unexpected token after this
    |
    = note: macros cannot expand to union fields
 
 error: unexpected token: `!`
-  --> $DIR/macro-expand-to-field.rs:54:10
+  --> $DIR/macro-expand-to-field.rs:66:10
    |
 LL |     field!(recovers:()),
    |          ^ unexpected token after this
    |
    = note: macros cannot expand to union fields
 
-error: aborting due to 8 previous errors
+error: aborting due to 9 previous errors
 
diff --git a/tests/ui/parser/macro/macro-expand-to-match-arm.rs b/tests/ui/parser/macro/macro-expand-to-match-arm.rs
@@ -8,8 +8,9 @@ fn main() {
     let x = Some(1);
     match x {
         Some(1) => {},
-        arm!(None => {}), //~ NOTE macros cannot expand to match arms
-        //~^ ERROR unexpected `,` in pattern
+        arm!(None => {}),
+        //~^ NOTE macros cannot expand to match arms
+        //~| ERROR unexpected `,` in pattern
         // doesn't recover
         Some(2) => {},
         _ => {},

Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,23 @@ LL \| field!(bar:u128),`
`7`	`7`	`= note: macros cannot expand to struct fields`
`8`	`8`
`9`	`9`	error: unexpected token: `!`
`10`		`- --> $DIR/macro-expand-to-field.rs:21:10`
	`10`	`+ --> $DIR/macro-expand-to-field.rs:22:10`
`11`	`11`	`\|`
`12`	`12`	`LL \| field!(recovers:()),`
`13`	`13`	`\| ^ unexpected token after this`
`14`	`14`	`\|`
`15`	`15`	`= note: macros cannot expand to struct fields`
`16`	`16`
`17`	`17`	error: unexpected token: `!`
`18`		`- --> $DIR/macro-expand-to-field.rs:27:12`
	`18`	`+ --> $DIR/macro-expand-to-field.rs:28:12`
`19`	`19`	`\|`
`20`	`20`	`LL \| variant!(whoops),`
`21`	`21`	`\| ^ unexpected token after this`
`22`	`22`	`\|`
`23`	`23`	`= note: macros cannot expand to enum variants`
`24`	`24`
`25`	`25`	error: unexpected token: `!`
`26`		`- --> $DIR/macro-expand-to-field.rs:32:12`
	`26`	`+ --> $DIR/macro-expand-to-field.rs:34:12`
`27`	`27`	`\|`
`28`	`28`	`LL \| variant!(recovers),`
`29`	`29`	`\| ^ unexpected token after this`
`@@ -33,34 +33,42 @@ LL \| variant!(recovers),`
`33`	`33`	error: unexpected token: `!`
`34`	`34`	`--> $DIR/macro-expand-to-field.rs:39:14`
`35`	`35`	`\|`
	`36`	`+LL \| field!(x:u32),`
	`37`	`+ \| ^ unexpected token after this`
	`38`	`+ \|`
	`39`	`+ = note: macros cannot expand to struct fields`
	`40`	`+`
	`41`	+error: unexpected token: `!`
	`42`	`+ --> $DIR/macro-expand-to-field.rs:48:14`
	`43`	`+ \|`
`36`	`44`	`LL \| field!(oopsies:()),`
`37`	`45`	`\| ^ unexpected token after this`
`38`	`46`	`\|`
`39`	`47`	`= note: macros cannot expand to struct fields`
`40`	`48`
`41`	`49`	error: unexpected token: `!`
`42`		`- --> $DIR/macro-expand-to-field.rs:42:14`
	`50`	`+ --> $DIR/macro-expand-to-field.rs:52:14`
`43`	`51`	`\|`
`44`	`52`	`LL \| field!(oopsies2:()),`
`45`	`53`	`\| ^ unexpected token after this`
`46`	`54`	`\|`
`47`	`55`	`= note: macros cannot expand to struct fields`
`48`	`56`
`49`	`57`	error: unexpected token: `!`
`50`		`- --> $DIR/macro-expand-to-field.rs:50:10`
	`58`	`+ --> $DIR/macro-expand-to-field.rs:61:10`
`51`	`59`	`\|`
`52`	`60`	`LL \| field!(oopsies:()),`
`53`	`61`	`\| ^ unexpected token after this`
`54`	`62`	`\|`
`55`	`63`	`= note: macros cannot expand to union fields`
`56`	`64`
`57`	`65`	error: unexpected token: `!`
`58`		`- --> $DIR/macro-expand-to-field.rs:54:10`
	`66`	`+ --> $DIR/macro-expand-to-field.rs:66:10`
`59`	`67`	`\|`
`60`	`68`	`LL \| field!(recovers:()),`
`61`	`69`	`\| ^ unexpected token after this`
`62`	`70`	`\|`
`63`	`71`	`= note: macros cannot expand to union fields`
`64`	`72`
`65`		`-error: aborting due to 8 previous errors`
	`73`	`+error: aborting due to 9 previous errors`
`66`	`74`