Skip to content

Commit 31335a5

Browse files
committed
---
yaml --- r: 91995 b: refs/heads/auto c: 08f4d1f h: refs/heads/master i: 91993: 7c043c6 91991: b469238 v: v3
1 parent cfe5f38 commit 31335a5

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: c54427ddfbbab41a39d14f2b1dc4f080cbc2d41b
16+
refs/heads/auto: 08f4d1ff9f2cc0092b307e1f438fb911bbf55185
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/kind.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,6 @@ fn with_appropriate_checker(cx: &Context,
182182
check_freevar_bounds(cx, fv.span, var_t, bounds, None);
183183
}
184184

185-
fn check_for_box(cx: &Context, fv: &freevar_entry, bounds: ty::BuiltinBounds) {
186-
// all captured data must be owned
187-
let id = ast_util::def_id_of_def(fv.def).node;
188-
let var_t = ty::node_id_to_type(cx.tcx, id);
189-
190-
// check that only immutable variables are implicitly copied in
191-
check_imm_free_var(cx, fv.def, fv.span);
192-
193-
check_freevar_bounds(cx, fv.span, var_t, bounds, None);
194-
}
195-
196185
fn check_for_block(cx: &Context, fv: &freevar_entry,
197186
bounds: ty::BuiltinBounds, region: ty::Region) {
198187
let id = ast_util::def_id_of_def(fv.def).node;
@@ -225,6 +214,7 @@ fn with_appropriate_checker(cx: &Context,
225214
..
226215
}) => {
227216
// can't happen
217+
fail!("internal error: saw closure with managed sigil (@fn)");
228218
}
229219
ty::ty_closure(ty::ClosureTy {
230220
sigil: BorrowedSigil,

0 commit comments

Comments
 (0)