Skip to content

Commit

Permalink
Rollup merge of rust-lang#42723 - ubsan:master, r=QuietMisdreavus
Browse files Browse the repository at this point in the history
Add `_` to the list of keywords

also, make sure the keyword table is correctly spaced

note: the reference also needs to be updated. This is not the only way to do this in the grammar, but it's my preferred way.
  • Loading branch information
frewsxcv authored Jun 18, 2017
2 parents ff320a1 + 723772f commit dd15323
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/doc/grammar.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,19 @@ token : simple_token | ident | literal | symbol | whitespace token ;

<p id="keyword-table-marker"></p>

| | | | | |
|----------|----------|----------|----------|---------|
| abstract | alignof | as | become | box |
| break | const | continue | crate | do |
| else | enum | extern | false | final |
| fn | for | if | impl | in |
| let | loop | macro | match | mod |
| move | mut | offsetof | override | priv |
| proc | pub | pure | ref | return |
| Self | self | sizeof | static | struct |
| super | trait | true | type | typeof |
| unsafe | unsized | use | virtual | where |
| while | yield | | | |
| | | | | |
|----------|----------|----------|----------|----------|
| _ | abstract | alignof | as | become |
| box | break | const | continue | crate |
| do | else | enum | extern | false |
| final | fn | for | if | impl |
| in | let | loop | macro | match |
| mod | move | mut | offsetof | override |
| priv | proc | pub | pure | ref |
| return | Self | self | sizeof | static |
| struct | super | trait | true | type |
| typeof | unsafe | unsized | use | virtual |
| where | while | yield | | |


Each of these keywords has special meaning in its grammar, and all of them are
Expand Down

0 comments on commit dd15323

Please sign in to comment.