---

yaml
---
r: 5877
b: refs/heads/master
c: ed985b6
h: refs/heads/master
i:
  5875: c0d3d31
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 354bfc829248965fa23c14cccd8c4db1685f3701
+refs/heads/master: ed985b61d5c1e35b10a135ec8872aec2fbf66531

trunk/src/comp/middle/typeck.rs

@@ -916,6 +916,10 @@ fn do_fn_ty_coerce(fcx: @fn_ctxt, sp: span, actual: ty::t, expected: ty::t)
                 ty::mk_fn(fcx.ccx.tcx, ast::proto_fn, args, ret_ty, cf,
                           constrs)
               }
+              some(ty::ty_fn(ast::proto_block., _, _, _, _)) {
+                ty::mk_fn(fcx.ccx.tcx, ast::proto_block, args, ret_ty, cf,
+                          constrs)
+              }
               _ { actual }
             }
           }

trunk/src/test/run-pass/fn-bare-coerce-to-block.rs

@@ -0,0 +1,7 @@
+fn# bare() {}
+
+fn likes_block(f: block()) { f() }
+
+fn main() {
+    likes_block(bare);
+}