Skip to content

Commit 34aeca7

Browse files
committed
---
yaml --- r: 146925 b: refs/heads/try2 c: 08f4d1f h: refs/heads/master i: 146923: 7915745 v: v3
1 parent de08e60 commit 34aeca7

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c54427ddfbbab41a39d14f2b1dc4f080cbc2d41b
8+
refs/heads/try2: 08f4d1ff9f2cc0092b307e1f438fb911bbf55185
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)