forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#101457 - ChayimFriedman2:struct-field-semi,…
… r=fee1-dead Recover from using `;` as separator between fields Partially fixes rust-lang#101440 (only for record structs). Doing that for tuple structs is harder as their parsing passes through a bunch of helper functions. I don't know how to do that. But [their error message is better anyway](https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=cc6ee8bb2593596c0cea89d49e79bcb4) and suggests using a comma, even if it doesn't suggest replacing the semicolon with it.
- Loading branch information
Showing
5 changed files
with
59 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
struct Foo { | ||
foo: i32; | ||
//~^ ERROR struct fields are separated by `,` | ||
} | ||
|
||
union Bar { //~ ERROR | ||
foo: i32; | ||
//~^ ERROR union fields are separated by `,` | ||
} | ||
|
||
enum Baz { | ||
Qux { foo: i32; } | ||
//~^ ERROR struct fields are separated by `,` | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
error: struct fields are separated by `,` | ||
--> $DIR/recover-field-semi.rs:2:13 | ||
| | ||
LL | foo: i32; | ||
| ^ help: replace `;` with `,` | ||
|
||
error: union fields are separated by `,` | ||
--> $DIR/recover-field-semi.rs:7:13 | ||
| | ||
LL | foo: i32; | ||
| ^ help: replace `;` with `,` | ||
|
||
error: struct fields are separated by `,` | ||
--> $DIR/recover-field-semi.rs:12:19 | ||
| | ||
LL | Qux { foo: i32; } | ||
| ^ help: replace `;` with `,` | ||
|
||
error: unions cannot have zero fields | ||
--> $DIR/recover-field-semi.rs:6:1 | ||
| | ||
LL | / union Bar { | ||
LL | | foo: i32; | ||
LL | | | ||
LL | | } | ||
| |_^ | ||
|
||
error: aborting due to 4 previous errors | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
struct S { | ||
bar: (); | ||
//~^ ERROR expected `,`, or `}`, found `;` | ||
//~^ ERROR struct fields are separated by `,` | ||
} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
error: expected `,`, or `}`, found `;` | ||
error: struct fields are separated by `,` | ||
--> $DIR/removed-syntax-field-semicolon.rs:2:12 | ||
| | ||
LL | bar: (); | ||
| ^ | ||
| ^ help: replace `;` with `,` | ||
|
||
error: aborting due to previous error | ||
|