Skip to content

Commit

Permalink
auto merge of #10726 : pnkfelix/rust/fsk-remove-at-fn-artifact, r=the…
Browse files Browse the repository at this point in the history
…stinger

While tracking down how this function became dead, identified a spot
(@fn cannot happen) where we probably would prefer to ICE rather than
pass silently; so added fail! invocation.
  • Loading branch information
bors committed Nov 29, 2013
2 parents 6c672ee + fffa10c commit 631cbd2
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions src/librustc/middle/kind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,6 @@ fn with_appropriate_checker(cx: &Context,
check_freevar_bounds(cx, fv.span, var_t, bounds, None);
}

fn check_for_box(cx: &Context, fv: &freevar_entry, bounds: ty::BuiltinBounds) {
// all captured data must be owned
let id = ast_util::def_id_of_def(fv.def).node;
let var_t = ty::node_id_to_type(cx.tcx, id);

// check that only immutable variables are implicitly copied in
check_imm_free_var(cx, fv.def, fv.span);

check_freevar_bounds(cx, fv.span, var_t, bounds, None);
}

fn check_for_block(cx: &Context, fv: &freevar_entry,
bounds: ty::BuiltinBounds, region: ty::Region) {
let id = ast_util::def_id_of_def(fv.def).node;
Expand Down Expand Up @@ -225,6 +214,7 @@ fn with_appropriate_checker(cx: &Context,
..
}) => {
// can't happen
fail!("internal error: saw closure with managed sigil (@fn)");
}
ty::ty_closure(ty::ClosureTy {
sigil: BorrowedSigil,
Expand Down

0 comments on commit 631cbd2

Please sign in to comment.