diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 19:39:09 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-30 19:39:09 +0100 |
| commit | 6f5b53013c54fa6d8429b717998cdb77a4d68b2c (patch) | |
| tree | c09cf0434ecf282cf1763d34cf838952db105e0a /xtask/src | |
| parent | e28ea81b2b68a61b5c5eec3c815172b17256a25f (diff) | |
| parent | fbe60a2e284035d16c2a1ee743ee88db418689aa (diff) | |
Merge #5611
5611: Finalize attribute grammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src')
| -rw-r--r-- | xtask/src/codegen/rust.ungram | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xtask/src/codegen/rust.ungram b/xtask/src/codegen/rust.ungram index a97cc80e9..8c4f953b0 100644 --- a/xtask/src/codegen/rust.ungram +++ b/xtask/src/codegen/rust.ungram | |||
| @@ -54,9 +54,8 @@ Abi = | |||
| 54 | 54 | ||
| 55 | ParamList = | 55 | ParamList = |
| 56 | '('( | 56 | '('( |
| 57 | (Param (',' Param)* ','?)? | 57 | SelfParam |
| 58 | | SelfParam ','? | 58 | | (SelfParam ',')? (Param (',' Param)* ','?)? |
| 59 | | SelfParam ',' (Param (',' Param)* ','?) | ||
| 60 | )')' | 59 | )')' |
| 61 | 60 | ||
| 62 | SelfParam = | 61 | SelfParam = |
| @@ -182,10 +181,7 @@ Visibility = | |||
| 182 | ')')? | 181 | ')')? |
| 183 | 182 | ||
| 184 | Attr = | 183 | Attr = |
| 185 | '#' '!'? '[' Path ('=' input:AttrInput)? ']' | 184 | '#' '!'? '[' Path ('=' Literal | TokenTree)? ']' |
| 186 | |||
| 187 | AttrInput = | ||
| 188 | Literal | TokenTree | ||
| 189 | 185 | ||
| 190 | ParenType = | 186 | ParenType = |
| 191 | '(' TypeRef ')' | 187 | '(' TypeRef ')' |