---

erickt · erickt · commit a726955d03d8 · 2012-09-27T19:24:11.000-07:00
yaml --- r: 30845 b: refs/heads/incoming c: b68d287 h: refs/heads/master i: 30843: c9529bf v: v3
diff --git a/[refs] b/[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: dc2f775037089cd5ce66eabb6a7d5405033e69f7
+refs/heads/incoming: b68d287780899dfb73083dff78241e02c7772f7e
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libsyntax/parse/parser.rs b/branches/incoming/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 {`