about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-08-17 06:25:22 -0700
committerGitHub <noreply@github.com>2016-08-17 06:25:22 -0700
commite83bff90ff7d0010d900dee2ecd0dcf4afaa26a7 (patch)
treed05a2701fd07a3b9eee127c9d2241ca25972efaa
parentd6d05904697d89099b55da3331155392f1db9c00 (diff)
parent85bbbad5926ab93c4c41c47eb11faffb4c8aeb5f (diff)
downloadrust-e83bff90ff7d0010d900dee2ecd0dcf4afaa26a7.tar.gz
rust-e83bff90ff7d0010d900dee2ecd0dcf4afaa26a7.zip
Rollup merge of #34370 - steveklabnik:keyword-ref-mention, r=Manishearth
A disclaimer about keywords.

Some people cite this list as "zomg Rust has so many keywords," so make
it clear that these aren't all used by the language today.
-rw-r--r--src/doc/grammar.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/doc/grammar.md b/src/doc/grammar.md
index fac488d9c4a..be64379b516 100644
--- a/src/doc/grammar.md
+++ b/src/doc/grammar.md
@@ -172,6 +172,11 @@ token : simple_token | ident | literal | symbol | whitespace token ;
 Each of these keywords has special meaning in its grammar, and all of them are
 excluded from the `ident` rule.
 
+Not all of these keywords are used by the language. Some of them were used
+before Rust 1.0, and were left reserved once their implementations were
+removed. Some of them were reserved before 1.0 to make space for possible
+future features.
+
 ### Literals
 
 ```antlr