diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2012-01-10 09:51:15 -0800 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2012-01-10 13:31:06 -0800 |
| commit | 1592de0fafcf74483ea0778a15015f87be426d3b (patch) | |
| tree | 3aa9aa6c47c6e9799e54846a8fad4913e9488ec3 /src/comp/middle | |
| parent | 8b911587dfed1cc1973b361865c3632a2e2cffde (diff) | |
replace lambda with fn@
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/freevars.rs | 7 | ||||
| -rw-r--r-- | src/comp/middle/trans_closure.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/typeck.rs | 14 |
3 files changed, 10 insertions, 15 deletions
diff --git a/src/comp/middle/freevars.rs b/src/comp/middle/freevars.rs index e1d481ca5c5..8578556b28e 100644 --- a/src/comp/middle/freevars.rs +++ b/src/comp/middle/freevars.rs @@ -36,8 +36,7 @@ fn collect_freevars(def_map: resolve::def_map, blk: ast::blk) fn ignore_item(_i: @ast::item, &&_depth: int, _v: visit::vt<int>) { } - let walk_expr = - fn@ (expr: @ast::expr, &&depth: int, v: visit::vt<int>) { + let walk_expr = fn@(expr: @ast::expr, &&depth: int, v: visit::vt<int>) { alt expr.node { ast::expr_fn(proto, decl, _, captures) { if proto != ast::proto_bare { @@ -89,8 +88,8 @@ fn annotate_freevars(def_map: resolve::def_map, crate: @ast::crate) -> freevar_map { let freevars = new_int_hash(); - let walk_fn = fn@ (_fk: visit::fn_kind, _decl: ast::fn_decl, - blk: ast::blk, _sp: span, nid: ast::node_id) { + let walk_fn = fn@(_fk: visit::fn_kind, _decl: ast::fn_decl, + blk: ast::blk, _sp: span, nid: ast::node_id) { let vars = collect_freevars(def_map, blk); freevars.insert(nid, vars); }; diff --git a/src/comp/middle/trans_closure.rs b/src/comp/middle/trans_closure.rs index 92ceed4879d..398d47469f4 100644 --- a/src/comp/middle/trans_closure.rs +++ b/src/comp/middle/trans_closure.rs @@ -209,8 +209,8 @@ fn allocate_cbox(bcx: @block_ctxt, let ccx = bcx_ccx(bcx); let alloc_in_heap = fn@(bcx: @block_ctxt, - xchgheap: bool, - &temp_cleanups: [ValueRef]) + xchgheap: bool, + &temp_cleanups: [ValueRef]) -> (@block_ctxt, ValueRef) { // n.b. If you are wondering why we don't use diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index bfa3463935a..be926322f64 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -1172,9 +1172,8 @@ fn gather_locals(ccx: @crate_ctxt, }; let tcx = ccx.tcx; - let next_var_id = fn@ () -> int { let rv = *nvi; *nvi += 1; ret rv; }; - let assign = - fn@ (nid: ast::node_id, ty_opt: option::t<ty::t>) { + let next_var_id = fn@() -> int { let rv = *nvi; *nvi += 1; ret rv; }; + let assign = fn@(nid: ast::node_id, ty_opt: option::t<ty::t>) { let var_id = next_var_id(); locals.insert(nid, var_id); alt ty_opt { @@ -1205,16 +1204,14 @@ fn gather_locals(ccx: @crate_ctxt, } // Add explicitly-declared locals. - let visit_local = - fn@ (local: @ast::local, &&e: (), v: visit::vt<()>) { + let visit_local = fn@(local: @ast::local, &&e: (), v: visit::vt<()>) { let local_ty = ast_ty_to_ty_crate_infer(ccx, local.node.ty); assign(local.node.id, local_ty); visit::visit_local(local, e, v); }; // Add pattern bindings. - let visit_pat = - fn@ (p: @ast::pat, &&e: (), v: visit::vt<()>) { + let visit_pat = fn@(p: @ast::pat, &&e: (), v: visit::vt<()>) { alt p.node { ast::pat_bind(_, _) { assign(p.id, none); } _ {/* no-op */ } @@ -1725,8 +1722,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt, expr: @ast::expr, unify: unifier, // functions. This is so that we have more information about the types // of arguments when we typecheck the functions. This isn't really the // right way to do this. - let check_args = - fn@ (check_blocks: bool) -> bool { + let check_args = fn@(check_blocks: bool) -> bool { let i = 0u; let bot = false; for a_opt: option::t<@ast::expr> in args { |
