Skip to content

Commit f7540b1

Browse files
committed
remove unused tps_fn(); comment out unused var
1 parent af8e471 commit f7540b1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/comp/middle/trans.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ fn trans_stack_local_derived_tydesc(cx: @block_ctxt, llsz: ValueRef,
937937

938938
// Objects and closures store their type parameters differently (in the object
939939
// or closure itself rather than in the type descriptor).
940-
tag ty_param_storage { tps_normal; tps_obj(uint); tps_fn(uint); }
940+
tag ty_param_storage { tps_normal; tps_obj(uint); }
941941

942942
fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool,
943943
storage: ty_param_storage,
@@ -958,7 +958,7 @@ fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool,
958958
let is_obj_body;
959959
alt storage {
960960
tps_normal. { is_obj_body = false; }
961-
tps_obj(_) | tps_fn(_) { is_obj_body = true; }
961+
tps_obj(_) { is_obj_body = true; }
962962
}
963963

964964
bcx_ccx(cx).stats.n_derived_tydescs += 1u;
@@ -1006,7 +1006,6 @@ fn get_derived_tydesc(cx: @block_ctxt, t: ty::t, escapes: bool,
10061006
alt storage {
10071007
tps_normal. { obj_params = 0u; }
10081008
tps_obj(np) { obj_params = np; }
1009-
tps_fn(np) { obj_params = 0x80000000u | np; }
10101009
}
10111010

10121011
let v;

src/comp/middle/trans_closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn build_environment(bcx: @block_ctxt, lltydescs: [ValueRef],
5555
};
5656
}
5757

58-
let ccx = bcx_ccx(bcx);
58+
//let ccx = bcx_ccx(bcx);
5959
let tcx = bcx_tcx(bcx);
6060

6161
// First, synthesize a tuple type containing the types of all the

0 commit comments

Comments
 (0)