---

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

Author: brson

[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: 68bdc09650ad897cbc5477b94c0c476b1b3313c1
+refs/heads/incoming: 96fdad2fb7210c73c1608c6d90f94a2b4335e0b7
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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);
               }

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

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