---

brson · brson · commit d1e28db7c1d3 · 2012-06-24T18:01:27.000-07:00
yaml --- r: 10690 b: refs/heads/snap-stage3 c: e991855 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c01f5ef034368f035270f083ad9ba0fe6aa27a1c
+refs/heads/snap-stage3: e991855d66cb299337b293d3e2d1b7f0a511ff69
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/snap-stage3/src/rustc/middle/block_use.rs b/branches/snap-stage3/src/rustc/middle/block_use.rs
@@ -34,7 +34,7 @@ fn visit_expr(ex: @expr, cx: ctx, v: visit::vt<ctx>) {
             i += 1u;
         }
       }
-      expr_loop_body(body) {
+      expr_loop_body(body) | expr_do_body(body) {
         cx.allow_block = true;
         v.visit_expr(body, cx, v);
       }
diff --git a/branches/snap-stage3/src/test/run-pass/do-stack.rs b/branches/snap-stage3/src/test/run-pass/do-stack.rs
@@ -0,0 +1,5 @@
+fn f(f: fn&(int)) { f(10) }
+
+fn main() {
+    do f() { |i| assert i == 10 }
+}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ fn visit_expr(ex: @expr, cx: ctx, v: visit::vt<ctx>) {`
`34`	`34`	`i += 1u;`
`35`	`35`	`}`
`36`	`36`	`}`
`37`		`- expr_loop_body(body) {`
	`37`	`+ expr_loop_body(body) \| expr_do_body(body) {`
`38`	`38`	`cx.allow_block = true;`
`39`	`39`	`v.visit_expr(body, cx, v);`
`40`	`40`	`}`