---

yaml
---
r: 15610
b: refs/heads/try
c: 2782cfb
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 9053f54498373c8ca799e777d8a979c0d32fbb07
+refs/heads/try: 2782cfb783129c1bf271cf31ac51f3a02d55c335
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -3305,9 +3305,20 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
         let rty = structurally_resolved_type(fcx, expr.span, expected);
         let (inner_ty, proto) = alt check ty::get(rty).struct {
           ty::ty_fn(fty) {
-            demand::suptype(fcx, expr.span, fty.output, ty::mk_bool(tcx));
-            (ty::mk_fn(tcx, {output: ty::mk_nil(tcx) with fty}),
-             fty.proto)
+            alt infer::mk_subty(fcx.infcx, fty.output, ty::mk_bool(tcx)) {
+              result::ok(_) {}
+              result::err(err) {
+                tcx.sess.span_fatal(
+                    expr.span, #fmt("a loop function's last argument should \
+                                     return `bool`, not `%s`",
+                                    ty_to_str(tcx, fty.output)));
+              }
+            }
+            (ty::mk_fn(tcx, {output: ty::mk_nil(tcx) with fty}), fty.proto)
+          }
+          _ {
+            tcx.sess.span_fatal(expr.span, "a loop function's last argument \
+                                            should be of function type");
           }
         };
         alt check b.node {

branches/try/src/test/compile-fail/bad-for-loop.rs

@@ -0,0 +1,4 @@
+fn main() {
+    fn baz(_x: fn() -> int) {}
+    for baz {|_e| } //! ERROR should return `bool`
+}

branches/try/src/test/compile-fail/block-must-not-have-result-for.rs

@@ -1,7 +1,7 @@
 // error-pattern:mismatched types: expected `()` but found `bool`
 
 fn main() {
-    for vec::iter([0]) {|_i|
+    for vec::each([0]) {|_i|
         true
     }
 }