---

yaml
---
r: 24536
b: refs/heads/try2
c: 3f59a4b
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: be2c92078b37b6e3a92275403e9670564f818ebb
+refs/heads/try2: 3f59a4bc64f46c5f44621327c697c5314b2f4358
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/parse/parser.rs

@@ -149,8 +149,7 @@ class parser {
     fn get_id() -> node_id { next_node_id(self.sess) }
 
     fn parse_ty_fn(purity: ast::purity) -> ty_ {
-        let proto = if self.eat_keyword("native") ||
-            self.eat_keyword("extern") {
+        let proto = if self.eat_keyword("extern") {
             self.expect_keyword("fn");
             ast::proto_bare
         } else {
@@ -433,8 +432,7 @@ class parser {
             self.parse_ty_fn(ast::unsafe_fn)
         } else if self.is_keyword("fn") {
             self.parse_ty_fn(ast::impure_fn)
-        } else if self.eat_keyword("native") ||
-            self.eat_keyword("extern") {
+        } else if self.eat_keyword("extern") {
             self.expect_keyword("fn");
             ty_fn(proto_bare, self.parse_ty_fn_decl(ast::impure_fn))
         } else if self.token == token::MOD_SEP || is_ident(self.token) {
@@ -2457,13 +2455,8 @@ class parser {
             } else {
                 self.parse_item_foreign_mod()
             }
-        } else if self.eat_keyword("crust") {
-            self.expect_keyword("fn");
-            self.parse_item_fn(extern_fn)
         } else if self.eat_keyword("mod") {
             self.parse_item_mod()
-        } else if self.eat_keyword("native") {
-            self.parse_item_foreign_mod()
         } else if self.eat_keyword("type") {
             self.parse_item_type()
         } else if self.eat_keyword("enum") {

branches/try2/src/libsyntax/parse/token.rs

@@ -293,14 +293,14 @@ fn restricted_keyword_table() -> hashmap<str, ()> {
         "alt",
         "assert",
         "break",
-        "check", "claim", "class", "const", "cont", "copy", "crust",
+        "check", "claim", "class", "const", "cont", "copy",
         "do", "drop",
         "else", "enum", "export", "extern",
         "fail", "false", "fn", "for",
         "if", "iface", "impl", "import",
         "let", "log", "loop",
         "mod", "mut",
-        "native", "new",
+        "new",
         "pure", "ret",
         "true", "trait", "type",
         "unchecked", "unsafe",