---

yaml
---
r: 31612
b: refs/heads/dist-snap
c: 336be1d
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 948172b93fc5d31b7234ad98ff6bac466401a86a
+refs/heads/dist-snap: 336be1d644ff2d07f6d9188afd7fbd33a6c1671a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/typeck/check.rs

@@ -1475,11 +1475,10 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
         capture::check_capture_clause(tcx, expr.id, cap_clause);
       }
       ast::expr_fn_block(decl, body, cap_clause) {
+         // Take the prototype from the expected type, but default to block:
           let proto = unpack_expected(fcx, expected, |sty|
               alt sty { ty::ty_fn({proto, _}) { some(proto) } _ { none } }
           ).get_default(ast::proto_box);
-        // Take the prototype from the expected type, but default to block:
-          let proto = proto_1.get_default(ast::proto_box);
         check_expr_fn(fcx, expr, proto, decl, body, false, expected);
         capture::check_capture_clause(tcx, expr.id, cap_clause);
       }