---

erickt · erickt · commit 0ff959bc78fe · 2012-09-27T19:24:11.000-07:00
yaml --- r: 24245 b: refs/heads/master c: b68d287 h: refs/heads/master i: 24243: 76f6a94 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dc2f775037089cd5ce66eabb6a7d5405033e69f7
+refs/heads/master: b68d287780899dfb73083dff78241e02c7772f7e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libsyntax/parse/parser.rs b/trunk/src/libsyntax/parse/parser.rs
@@ -2231,7 +2231,8 @@ impl parser {
         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));
+        let blk_check_mode = if us { unsafe_blk } else { default_blk };
+        return (inner, self.parse_block_tail_(lo, blk_check_mode, next));
     }
 
     fn parse_block_no_value() -> blk {

Original file line number	Diff line number	Diff line change
`@@ -2231,7 +2231,8 @@ impl parser {`
`2231`	`2231`	`self.expect(token::LBRACE);`
`2232`	`2232`	`let {inner, next} = maybe_parse_inner_attrs_and_next(self,`
`2233`	`2233`	`parse_attrs);`
`2234`		`- return (inner, self.parse_block_tail_(lo, if us { unsafe_blk } else { default_blk }, next));`
	`2234`	`+ let blk_check_mode = if us { unsafe_blk } else { default_blk };`
	`2235`	`+ return (inner, self.parse_block_tail_(lo, blk_check_mode, next));`
`2235`	`2236`	`}`
`2236`	`2237`
`2237`	`2238`	`fn parse_block_no_value() -> blk {`