diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-02-24 20:17:02 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-04-20 13:41:18 +1200 |
| commit | ff04aa8e385f343f66c5bed6a34d1ebf6c971e4d (patch) | |
| tree | 9c0845b6a369ab071138f6c542e7aef46ff5a2a0 /src/libsyntax/parse/token.rs | |
| parent | 3757f01c9bed7b2fe0d726ac45c754312e2917ea (diff) | |
| download | rust-ff04aa8e385f343f66c5bed6a34d1ebf6c971e4d.tar.gz rust-ff04aa8e385f343f66c5bed6a34d1ebf6c971e4d.zip | |
Allow inheritance between structs.
No subtyping, no interaction with traits. Partially addresses #9912.
Diffstat (limited to 'src/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 77743cdb9df..611ce7cc527 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -474,22 +474,23 @@ declare_special_idents_and_keywords! { (35, Type, "type"); (36, Unsafe, "unsafe"); (37, Use, "use"); - (38, While, "while"); - (39, Continue, "continue"); - (40, Proc, "proc"); - (41, Box, "box"); + (38, Virtual, "virtual"); + (39, While, "while"); + (40, Continue, "continue"); + (41, Proc, "proc"); + (42, Box, "box"); 'reserved: - (42, Alignof, "alignof"); - (43, Be, "be"); - (44, Offsetof, "offsetof"); - (45, Priv, "priv"); - (46, Pure, "pure"); - (47, Sizeof, "sizeof"); - (48, Typeof, "typeof"); - (49, Unsized, "unsized"); - (50, Yield, "yield"); - (51, Do, "do"); + (43, Alignof, "alignof"); + (44, Be, "be"); + (45, Offsetof, "offsetof"); + (46, Priv, "priv"); + (47, Pure, "pure"); + (48, Sizeof, "sizeof"); + (49, Typeof, "typeof"); + (50, Unsized, "unsized"); + (51, Yield, "yield"); + (52, Do, "do"); } } |