---

yaml
---
r: 3324
b: refs/heads/master
c: 5495ad1
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 860e8fd98b07cc0dfbb3ff33124778c2225ba81d
+refs/heads/master: 5495ad17d185a683f7bb0635ff515d28768ce02d

trunk/src/comp/middle/typeck.rs

@@ -974,8 +974,16 @@ mod writeback {
     fn visit_stmt_pre(@fn_ctxt fcx, &@ast::stmt s) {
         resolve_type_vars_for_node(fcx, s.span, ty::stmt_node_id(s));
     }
-    fn visit_expr_pre(@fn_ctxt fcx, &@ast::expr e) {
+    fn visit_expr_pre(@mutable bool ignore, @fn_ctxt fcx, &@ast::expr e) {
         resolve_type_vars_for_node(fcx, e.span, e.id);
+        alt (e.node) {
+            // We don't want to recurse down into lambdas.
+            case (ast::expr_fn(_)) { *ignore = true; }
+            case (_) { }
+        }
+    }
+    fn visit_expr_post(@mutable bool ignore, &@ast::expr e) {
+        *ignore = false;
     }
     fn visit_block_pre(@fn_ctxt fcx, &ast::block b) {
         resolve_type_vars_for_node(fcx, b.span, b.node.id);
@@ -1015,7 +1023,8 @@ mod writeback {
                 visit_item_pre=bind visit_item_pre(ignore, _),
                 visit_item_post=bind visit_item_post(ignore, _),
                 visit_stmt_pre=bind visit_stmt_pre(fcx, _),
-                visit_expr_pre=bind visit_expr_pre(fcx, _),
+                visit_expr_pre=bind visit_expr_pre(ignore, fcx, _),
+                visit_expr_post=bind visit_expr_post(ignore, _),
                 visit_block_pre=bind visit_block_pre(fcx, _),
                 visit_pat_pre=bind visit_pat_pre(fcx, _),
                 visit_local_pre=bind visit_local_pre(fcx, _)

trunk/src/test/run-pass/fn-type-infer.rs

@@ -0,0 +1,6 @@
+// xfail-stage0
+
+fn main() {
+    // We should be able to type infer inside of lambdas.
+    auto f = fn () { auto i = 10; };
+}