about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs5
-rw-r--r--src/libsyntax/parse/token.rs2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index c714fe59b13..c1e5de48741 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -180,7 +180,7 @@ pure fn maybe_append(+lhs: ~[attribute], rhs: option<~[attribute]>)
 
 /* ident is handled by common.rs */
 
-class parser {
+struct parser {
     let sess: parse_sess;
     let cfg: crate_cfg;
     let file_type: file_type;
@@ -3201,8 +3201,7 @@ class parser {
             return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
                                           visibility,
                                           maybe_append(attrs, extra_attrs)));
-        } else if items_allowed &&
-                (self.eat_keyword(~"class") || self.eat_keyword(~"struct")) {
+        } else if items_allowed && self.eat_keyword(~"struct") {
             let (ident, item_, extra_attrs) = self.parse_item_class();
             return iovi_item(self.mk_item(lo, self.last_span.hi, ident, item_,
                                           visibility,
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index a99d071b6ef..0f4d71c281c 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -335,7 +335,7 @@ fn restricted_keyword_table() -> hashmap<~str, ()> {
     let keys = ~[
         ~"again", ~"assert",
         ~"break",
-        ~"check", ~"class", ~"const", ~"copy",
+        ~"check", ~"const", ~"copy",
         ~"do", ~"drop",
         ~"else", ~"enum", ~"export", ~"extern",
         ~"fail", ~"false", ~"fn", ~"for",