auto merge of #18375 : steveklabnik/rust/gh17969, r=alexcrichton

Fixes #17969
This commit is contained in:
bors 2014-10-29 15:17:01 +00:00
commit dd7113609c

View File

@ -185,28 +185,29 @@ grammar as double-quoted strings. Other tokens have exact rules given.
### Keywords ### Keywords
<p id="keyword-table-marker">The keywords are the following strings, organized by first letter:</p> <p id="keyword-table-marker"></p>
| | | | | |
|----------|----------|----------|----------|--------|
| abstract | alignof | as | be | box |
| break | const | continue | crate | do |
| else | enum | extern | false | final |
| fn | for | if | impl | in |
| let | loop | match | mod | move |
| mut | offsetof | once | override | priv |
| proc | pub | pure | ref | return |
| sizeof | static | self | struct | super |
| true | trait | type | typeof | unsafe |
| unsized | use | virtual | where | while |
| yield | | | | |
| | | | |
|----------|--------|--------|-------|
| as | | | |
| box | break | | |
| continue | crate | | |
| else | enum | extern | |
| false | fn | for | |
| if | impl | in | |
| let | loop | | |
| match | mod | mut | |
| priv | proc | pub | |
| ref | return | | |
| self | static | struct | super |
| trait | true | type | |
| unsafe | use | | |
| while | | | |
Each of these keywords has special meaning in its grammar, and all of them are Each of these keywords has special meaning in its grammar, and all of them are
excluded from the `ident` rule. excluded from the `ident` rule.
Note that some of these keywords are reserved, and do not currently do
anything.
### Literals ### Literals
A literal is an expression consisting of a single token, rather than a sequence A literal is an expression consisting of a single token, rather than a sequence