---

yaml
---
r: 24227
b: refs/heads/master
c: 459fe6a
h: refs/heads/master
i:
  24225: 8c26fae
  24223: df1a418
v: v3

Author: benjaminp

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7e7411e6209b10d99bc37c084c8ac45fbb706431
+refs/heads/master: 459fe6ad558e58db68d622ceacb79e3e8f95c35b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/parse/parser.rs

@@ -2227,17 +2227,11 @@ impl parser {
         }
 
         let lo = self.span.lo;
-        if self.eat_keyword(~"unsafe") {
-            self.expect(token::LBRACE);
-            let {inner, next} = maybe_parse_inner_attrs_and_next(self,
-                                                                 parse_attrs);
-            return (inner, self.parse_block_tail_(lo, unsafe_blk, next));
-        } else {
-            self.expect(token::LBRACE);
-            let {inner, next} = maybe_parse_inner_attrs_and_next(self,
-                                                                 parse_attrs);
-            return (inner, self.parse_block_tail_(lo, default_blk, next));
-        }
+        let us = self.eat_keyword(~"unsafe");
+        self.expect(token::LBRACE);
+        let {inner, next} = maybe_parse_inner_attrs_and_next(self,
+                                                             parse_attrs);
+        return (inner, self.parse_block_tail_(lo, if us { unsafe_blk } else { default_blk }, next));
     }
 
     fn parse_block_no_value() -> blk {