about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-04-24 09:48:50 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-04-24 09:48:50 +0530
commit292a25f7557ed229dd99c5537603084a7594d6f4 (patch)
tree171fe51ce5e62e6e82b192730eb5a3e31e4f9a9e
parent9863f2c4f353c600afaa159b697513ddbd1ff8fa (diff)
parent17390a1a79ce57c1d1e997821333a7e3b54ef158 (diff)
downloadrust-292a25f7557ed229dd99c5537603084a7594d6f4.tar.gz
rust-292a25f7557ed229dd99c5537603084a7594d6f4.zip
Rollup merge of #24742 - mbrubeck:keywords, r=steveklabnik
 * Add two missing keywords, `Self` and `proc`
* Fix some mis-alphabetized keywords

r? @steveklabnik
-rw-r--r--src/doc/reference.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/doc/reference.md b/src/doc/reference.md
index 3e8aa7c3ad0..46d71210f8b 100644
--- a/src/doc/reference.md
+++ b/src/doc/reference.md
@@ -198,10 +198,11 @@ grammar as double-quoted strings. Other tokens have exact rules given.
 | fn       | for      | if       | impl     | in      |
 | let      | loop     | macro    | match    | mod     |
 | move     | mut      | offsetof | override | priv    |
-| pub      | pure     | ref      | return   | sizeof  |
-| static   | self     | struct   | super    | true    |
-| trait    | type     | typeof   | unsafe   | unsized |
-| use      | virtual  | where    | while    | yield   |
+| 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