diff options
| author | bors <bors@rust-lang.org> | 2014-02-11 00:41:44 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-11 00:41:44 -0800 |
| commit | 86e6a5cf7beb567ff908ea35748392bd0bb01b58 (patch) | |
| tree | 65b585d43911a6ef56baa51c4cc3d661b93f3cff /src/libsyntax/parse | |
| parent | 3794d681b3479224917c0efb7a769c2583a4ee0e (diff) | |
| parent | a2fab457dcb6e65e119694acacc8d92fde2569c2 (diff) | |
| download | rust-86e6a5cf7beb567ff908ea35748392bd0bb01b58.tar.gz rust-86e6a5cf7beb567ff908ea35748392bd0bb01b58.zip | |
auto merge of #12170 : aepsil0n/rust/feature/reserve_do_keyword, r=brson
This resolves issue #12157. Does that do it already or is there something else that needs taking care of? As a side note, there seems to be some documentation, in which the old existence of the do keyword is explained. The list of keywords is not up-to-date either. But these are certainly separate issues.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index d32411b4f05..1e9eab1573b 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -492,6 +492,7 @@ declare_special_idents_and_keywords! { (53, Typeof, "typeof"); (54, Unsized, "unsized"); (55, Yield, "yield"); + (56, Do, "do"); } } |
