diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-06-18 10:34:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-18 10:34:11 -0600 |
| commit | 2068596a54072d91f8c17c3f92f2c4a3c5732873 (patch) | |
| tree | 6c2b433d7c794e424ac83fc757f3c0acb5862041 | |
| parent | c982529327010c92e08b22703d7930f505cfb90a (diff) | |
| parent | 723772fc556506d5357273e7f84b677e7c62bc96 (diff) | |
| download | rust-2068596a54072d91f8c17c3f92f2c4a3c5732873.tar.gz rust-2068596a54072d91f8c17c3f92f2c4a3c5732873.zip | |
Rollup merge of #42723 - ubsan:master, r=QuietMisdreavus
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.
| -rw-r--r-- | src/doc/grammar.md | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/doc/grammar.md b/src/doc/grammar.md index 12daa24e857..78432b6a965 100644 --- a/src/doc/grammar.md +++ b/src/doc/grammar.md @@ -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 |