Skip to content

Commit 48090a7

Browse files
committed
---
yaml --- r: 2601 b: refs/heads/master c: 87288a1 h: refs/heads/master i: 2599: 3367505 v: v3
1 parent 1f0335f commit 48090a7

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: d21741843c4c4af2d6fed4fc1d9824fbfd960579
2+
refs/heads/master: 87288a186d1753b25378e94b3626fe8009e92fde

trunk/src/comp/middle/typeck.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,7 +2662,7 @@ fn check_block(&@fn_ctxt fcx, &ast::block block) {
26622662
}
26632663

26642664
fn check_const(&@crate_ctxt ccx, &span sp, &ast::ident ident, &@ast::ty t,
2665-
&@ast::expr e, &ast::def_id id, &ast::ann ann) -> @ast::item {
2665+
&@ast::expr e, &ast::def_id id, &ast::ann ann) {
26662666
// FIXME: this is kinda a kludge; we manufacture a fake "function context"
26672667
// for checking the initializer expression.
26682668
auto rty = ann_to_type(ccx.node_types, ann);
@@ -2671,10 +2671,7 @@ fn check_const(&@crate_ctxt ccx, &span sp, &ast::ident ident, &@ast::ty t,
26712671
locals = @common::new_def_hash[ty::t](),
26722672
ccx = ccx);
26732673
check_expr(fcx, e);
2674-
// FIXME: necessary? Correct sequence?
26752674
Pushdown::pushdown_expr(fcx, rty, e);
2676-
auto item = ast::item_const(ident, t, e, id, ann);
2677-
ret @fold::respan[ast::item_](sp, item);
26782675
}
26792676

26802677
fn check_fn(&@crate_ctxt ccx, &ast::fn_decl decl, ast::proto proto,

0 commit comments

Comments
 (0)