---

yaml
---
r: 16091
b: refs/heads/try
c: 5d1c299
h: refs/heads/master
i:
  16089: 026f3dc
  16087: 74fa67c
v: v3

Author: msullivan

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 98766e388e3f1ec861331224ecafd80d39554d38
+refs/heads/try: 5d1c29912d7205e81726fb19571e8b706847317d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/block_use.rs

@@ -15,7 +15,8 @@ fn visit_expr(ex: @expr, cx: ctx, v: visit::vt<ctx>) {
     if !cx.allow_block {
         alt ty::get(ty::expr_ty(cx.tcx, ex)).struct {
           ty::ty_fn({proto: p, _}) if is_blockish(p) {
-            cx.tcx.sess.span_err(ex.span, "expressions with block type \
+            cx.tcx.sess.span_err(ex.span,
+               "expressions with stack closure type \
                 can only appear in callee or (by-ref) argument position");
           }
           _ {}

branches/try/src/test/compile-fail/block-copy.rs

@@ -1,4 +1,4 @@
-// error-pattern: block type can only appear
+// error-pattern: stack closure type can only appear
 
 fn lol(f: fn()) -> fn() { ret f; }
 fn main() {