Skip to content

Commit 9fa7491

Browse files
committed
Don't resolve upvars in fn() { ... } exprs
Closes #1467
1 parent 26536e6 commit 9fa7491

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/comp/middle/resolve.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -486,12 +486,9 @@ fn visit_fn_with_scope(e: @env, fk: visit::fn_kind, decl: ast::fn_decl,
486486
for c: @ast::constr in decl.constraints { resolve_constr(e, c, sc, v); }
487487
let scope = alt fk {
488488
visit::fk_item_fn(_, tps) | visit::fk_res(_, tps) |
489-
visit::fk_method(_, tps) {
490-
scope_bare_fn(decl, id, tps)
491-
}
492-
visit::fk_anon(_) | visit::fk_fn_block. {
493-
scope_fn_expr(decl, id, [])
494-
}
489+
visit::fk_method(_, tps) { scope_bare_fn(decl, id, tps) }
490+
visit::fk_anon(ast::proto_bare.) { scope_bare_fn(decl, id, []) }
491+
visit::fk_anon(_) | visit::fk_fn_block. { scope_fn_expr(decl, id, []) }
495492
};
496493

497494
visit::visit_fn(fk, decl, body, sp, id, cons(scope, @sc), v);

0 commit comments

Comments
 (0)