---

yaml
---
r: 30589
b: refs/heads/incoming
c: 2d11a04
h: refs/heads/master
i:
  30587: feee833
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: c755449fd6c10bf0b7850788b9faf6799ef7e38d
+refs/heads/incoming: 2d11a04e742410561f392801d29d622867e105b8
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libsyntax/ast.rs

@@ -642,16 +642,14 @@ type field_ = {mutbl: mutability, ident: ident, expr: @expr};
 type field = spanned<field_>;
 
 #[auto_serialize]
-enum blk_check_mode { default_blk, unchecked_blk, unsafe_blk, }
+enum blk_check_mode { default_blk, unsafe_blk, }
 
 impl blk_check_mode : cmp::Eq {
     pure fn eq(&&other: blk_check_mode) -> bool {
         match (self, other) {
             (default_blk, default_blk) => true,
-            (unchecked_blk, unchecked_blk) => true,
             (unsafe_blk, unsafe_blk) => true,
             (default_blk, _) => false,
-            (unchecked_blk, _) => false,
             (unsafe_blk, _) => false,
         }
     }

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

@@ -61,7 +61,7 @@ use ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
              ty_box, ty_field, ty_fn, ty_infer, ty_mac, ty_method, ty_nil,
              ty_param, ty_param_bound, ty_path, ty_ptr, ty_rec, ty_rptr,
              ty_tup, ty_u32, ty_uniq, ty_vec, ty_fixed_length, type_value_ns,
-             unchecked_blk, uniq, unnamed_field, unsafe_blk, unsafe_fn,
+             uniq, unnamed_field, unsafe_blk, unsafe_fn,
              variant, view_item, view_item_, view_item_export,
              view_item_import, view_item_use, view_path, view_path_glob,
              view_path_list, view_path_simple, visibility, vstore, vstore_box,

branches/incoming/src/libsyntax/print/pprust.rs

@@ -857,7 +857,6 @@ fn print_possibly_embedded_block_(s: ps, blk: ast::blk, embedded: embed_type,
                                   indented: uint, attrs: ~[ast::attribute],
                                   close_box: bool) {
     match blk.node.rules {
-      ast::unchecked_blk => word(s.s, ~"unchecked"),
       ast::unsafe_blk => word(s.s, ~"unsafe"),
       ast::default_blk => ()
     }

branches/incoming/src/rustc/middle/borrowck/check_loans.rs

@@ -673,9 +673,6 @@ fn check_loans_in_block(blk: ast::blk,
         match blk.node.rules {
           ast::default_blk => {
           }
-          ast::unchecked_blk => {
-            self.declared_purity = ast::impure_fn;
-          }
           ast::unsafe_blk => {
             self.declared_purity = ast::unsafe_fn;
           }

branches/incoming/src/rustc/middle/typeck/check.rs

@@ -2168,7 +2168,6 @@ fn check_block_no_value(fcx: @fn_ctxt, blk: ast::blk) -> bool {
 
 fn check_block(fcx0: @fn_ctxt, blk: ast::blk) -> bool {
     let fcx = match blk.node.rules {
-      ast::unchecked_blk => @fn_ctxt {purity: ast::impure_fn,.. *fcx0},
       ast::unsafe_blk => @fn_ctxt {purity: ast::unsafe_fn,.. *fcx0},
       ast::default_blk => fcx0
     };