diff options
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 10 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 12 |
2 files changed, 6 insertions, 16 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 7ce936ed165..56641a9ba27 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4692,11 +4692,6 @@ impl<'a> Parser<'a> { let class_name = try!(self.parse_ident()); let mut generics = try!(self.parse_generics()); - if try!(self.eat(&token::Colon) ){ - let ty = try!(self.parse_ty_sum()); - self.span_err(ty.span, "`virtual` structs have been removed from the language"); - } - // There is a special case worth noting here, as reported in issue #17904. // If we are parsing a tuple struct it is the case that the where clause // should follow the field list. Like so: @@ -5383,11 +5378,6 @@ impl<'a> Parser<'a> { try!(self.expect_one_of(&[], &[])); } - if try!(self.eat_keyword_noexpect(keywords::Virtual) ){ - let span = self.span; - self.span_err(span, "`virtual` structs have been removed from the language"); - } - if try!(self.eat_keyword(keywords::Static) ){ // STATIC ITEM let m = if try!(self.eat_keyword(keywords::Mut)) {MutMutable} else {MutImmutable}; diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index ca92a37d8c3..a392872f753 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -575,13 +575,13 @@ declare_special_idents_and_keywords! { (36, Type, "type"); (37, Unsafe, "unsafe"); (38, Use, "use"); - (39, Virtual, "virtual"); - (40, While, "while"); - (41, Continue, "continue"); - (42, Box, "box"); - (43, Const, "const"); - (44, Where, "where"); + (39, While, "while"); + (40, Continue, "continue"); + (41, Box, "box"); + (42, Const, "const"); + (43, Where, "where"); 'reserved: + (44, Virtual, "virtual"); (45, Proc, "proc"); (46, Alignof, "alignof"); (47, Become, "become"); |