---

yaml
---
r: 30586
b: refs/heads/incoming
c: d0d8b7f
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 2cdb23bbc08fba2f5dc7b0dcc79983fc02e32960
+refs/heads/incoming: d0d8b7fe6491d539254d281f39a6c0aa0261e42d
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -926,8 +926,6 @@ impl parser {
               _ => { /* fallthrough */ }
             }
             return pexpr(self.parse_fn_expr(proto));
-        } else if self.eat_keyword(~"unchecked") {
-            return pexpr(self.parse_block_expr(lo, unchecked_blk));
         } else if self.eat_keyword(~"unsafe") {
             return pexpr(self.parse_block_expr(lo, unsafe_blk));
         } else if self.token == token::LBRACKET {
@@ -2210,12 +2208,7 @@ impl parser {
         }
 
         let lo = self.span.lo;
-        if self.eat_keyword(~"unchecked") {
-            self.expect(token::LBRACE);
-            let {inner, next} = maybe_parse_inner_attrs_and_next(self,
-                                                                 parse_attrs);
-            return (inner, self.parse_block_tail_(lo, unchecked_blk, next));
-        } else if self.eat_keyword(~"unsafe") {
+        if self.eat_keyword(~"unsafe") {
             self.expect(token::LBRACE);
             let {inner, next} = maybe_parse_inner_attrs_and_next(self,
                                                                  parse_attrs);

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

@@ -439,7 +439,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
         ~"ref", ~"return",
         ~"struct",
         ~"true", ~"trait", ~"type",
-        ~"unchecked", ~"use",
+        ~"use",
         ~"while"
     ];
     for keys.each |word| {