---

yaml
---
r: 5751
b: refs/heads/master
c: 5b0f79b
h: refs/heads/master
i:
  5749: 2654173
  5747: f0d48e0
  5743: a10e102
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2770393252afaca3c9f31b856040618bcb25736
+refs/heads/master: 5b0f79b75a40370625383e4fe81bcec5f68ee18d

trunk/src/comp/middle/typeck.rs

@@ -2116,7 +2116,18 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier,
             }
             i += 1u;
         }
-        let ft = ty::mk_fn(tcx, proto, out_args, rt, cf, constrs);
+
+        // Determine what fn prototype results from binding
+        fn lower_bound_proto(proto: ast::proto) -> ast::proto {
+            // FIXME: This is right for bare fns, possibly not others
+            alt proto {
+              ast::proto_bare. { ast::proto_fn }
+              _ { proto }
+            }
+        }
+
+        let ft = ty::mk_fn(tcx, lower_bound_proto(proto),
+                           out_args, rt, cf, constrs);
         write::ty_only_fixup(fcx, id, ft);
       }
       ast::expr_call(f, args) {

trunk/src/test/compile-fail/fn-bare-bind.rs

@@ -0,0 +1,9 @@
+// error-pattern:mismatched types: expected fn#() but found fn()
+
+fn# f() {
+}
+
+fn main() {
+    // Can't produce a bare function by binding
+    let g: fn#() = bind f();
+}