diff options
| author | bors <bors@rust-lang.org> | 2014-10-08 13:47:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-08 13:47:13 +0000 |
| commit | c588e407b9d06d4ce6e105be4f271b21bf0449c6 (patch) | |
| tree | b5105a3c5fd097798348dacc63a054ea12b3815a /src/libsyntax/parse | |
| parent | eb2240aca311075f4a4625c11956b582eefae9b7 (diff) | |
| parent | 3db9070e9c2a88cf88766d277ffc03ab65e72dec (diff) | |
| download | rust-c588e407b9d06d4ce6e105be4f271b21bf0449c6.tar.gz rust-c588e407b9d06d4ce6e105be4f271b21bf0449c6.zip | |
auto merge of #17866 : jgallagher/rust/reserve-inheritance-keywords, r=huonw
Closes #17862
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index a8c827439cc..7cc78891d91 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -520,6 +520,9 @@ declare_special_idents_and_keywords! { (54, Unsized, "unsized"); (55, Yield, "yield"); (56, Do, "do"); + (57, Abstract, "abstract"); + (58, Final, "final"); + (59, Override, "override"); } } |