---

yaml
---
r: 7129
b: refs/heads/master
c: 9fa7491
h: refs/heads/master
i:
  7127: fc86010
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26536e69151d5f8e083d8165421039b409c93ee3
+refs/heads/master: 9fa749167680a2d4de9fa07cbb2c8336deb7d42f

trunk/src/comp/middle/resolve.rs

@@ -486,12 +486,9 @@ fn visit_fn_with_scope(e: @env, fk: visit::fn_kind, decl: ast::fn_decl,
     for c: @ast::constr in decl.constraints { resolve_constr(e, c, sc, v); }
     let scope = alt fk {
       visit::fk_item_fn(_, tps) | visit::fk_res(_, tps) |
-      visit::fk_method(_, tps) {
-        scope_bare_fn(decl, id, tps)
-      }
-      visit::fk_anon(_) | visit::fk_fn_block. {
-        scope_fn_expr(decl, id, [])
-      }
+      visit::fk_method(_, tps) { scope_bare_fn(decl, id, tps) }
+      visit::fk_anon(ast::proto_bare.) { scope_bare_fn(decl, id, []) }
+      visit::fk_anon(_) | visit::fk_fn_block. { scope_fn_expr(decl, id, []) }
     };
 
     visit::visit_fn(fk, decl, body, sp, id, cons(scope, @sc), v);