Skip to content

Commit 6e34679

Browse files
committed
rustc: Remove a minor rustboot workaround in typeck::resolve_local_types_in_block()
1 parent c124404 commit 6e34679

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/comp/middle/typeck.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,16 +1602,11 @@ fn resolve_local_types_in_block(&@fn_ctxt fcx, &ast::block block)
16021602
ret !option::is_none[@fn_ctxt](env);
16031603
}
16041604

1605-
// FIXME: rustboot bug prevents us from using these functions directly
16061605
auto fld = fold::new_identity_fold[option::t[@fn_ctxt]]();
1607-
auto wbl = writeback_local;
1608-
auto rltia = bind resolve_local_types_in_annotation(_,_);
1609-
auto uefi = update_env_for_item;
1610-
auto kg = keep_going;
1611-
fld = @rec(fold_decl_local = wbl,
1612-
fold_ann = rltia,
1613-
update_env_for_item = uefi,
1614-
keep_going = kg
1606+
fld = @rec(fold_decl_local = writeback_local,
1607+
fold_ann = resolve_local_types_in_annotation,
1608+
update_env_for_item = update_env_for_item,
1609+
keep_going = keep_going
16151610
with *fld);
16161611
ret fold::fold_block[option::t[@fn_ctxt]](some(fcx), fld, block);
16171612
}

0 commit comments

Comments
 (0)