---

yaml
---
r: 23128
b: refs/heads/master
c: 96fdad2
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 68bdc09650ad897cbc5477b94c0c476b1b3313c1
+refs/heads/master: 96fdad2fb7210c73c1608c6d90f94a2b4335e0b7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/check_loop.rs

@@ -40,7 +40,7 @@ fn check_crate(tcx: ty::ctxt, crate: @crate) {
               }
               expr_ret(oe) => {
                 if !cx.can_ret {
-                    tcx.sess.span_err(e.span, ~"`ret` in block function");
+                    tcx.sess.span_err(e.span, ~"`return` in block function");
                 }
                 visit::visit_expr_opt(oe, cx, v);
               }

trunk/src/test/compile-fail/return-in-block-function.rs

@@ -0,0 +1,5 @@
+fn main() {
+    let _x = || {
+        return //~ ERROR: `return` in block function
+    };
+}