Skip to content

Commit 97180bb

Browse files
committed
---
yaml --- r: 30900 b: refs/heads/incoming c: affa388 h: refs/heads/master v: v3
1 parent 2b9618c commit 97180bb

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 6bb0399df2123a2a87262b0f36ba0e56f1de787b
9+
refs/heads/incoming: affa3880debc91adde71e78345c30ce2044f8cef
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/task/spawn.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -511,15 +511,8 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
511511

512512
let child_wrapper = make_child_wrapper(new_task, move child_tg,
513513
move ancestors, is_main, move notify_chan, move f);
514-
/*
515-
Truly awful, but otherwise the borrow checker complains about
516-
the move in the last line of this block, for reasons I can't
517-
understand. -- tjc
518-
*/
519-
let tmp: u64 = cast::reinterpret_cast(&(&child_wrapper));
520-
let whatever: &~fn() = cast::reinterpret_cast(&tmp);
521-
let fptr = ptr::p2::addr_of(whatever);
522-
let closure: *rust_closure = cast::reinterpret_cast(&fptr);
514+
515+
let closure = cast::transmute(&child_wrapper);
523516

524517
// Getting killed between these two calls would free the child's
525518
// closure. (Reordering them wouldn't help - then getting killed

0 commit comments

Comments
 (0)