Skip to content

Commit 1f94364

Browse files
committed
core::rt: Clean up some more hacks
1 parent ed74ac1 commit 1f94364

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

src/libcore/rt/sched/mod.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,13 @@ pub struct Scheduler {
4646
// XXX: Some hacks to put a &fn in Scheduler without borrowck
4747
// complaining
4848
type UnsafeTaskReceiver = sys::Closure;
49-
trait HackAroundBorrowCk {
49+
trait ClosureConverter {
5050
fn from_fn(&fn(~Task)) -> Self;
5151
fn to_fn(self) -> &fn(~Task);
5252
}
53-
impl HackAroundBorrowCk for UnsafeTaskReceiver {
54-
fn from_fn(f: &fn(~Task)) -> UnsafeTaskReceiver {
55-
unsafe { transmute(f) }
56-
}
57-
fn to_fn(self) -> &fn(~Task) {
58-
unsafe { transmute(self) }
59-
}
53+
impl ClosureConverter for UnsafeTaskReceiver {
54+
fn from_fn(f: &fn(~Task)) -> UnsafeTaskReceiver { unsafe { transmute(f) } }
55+
fn to_fn(self) -> &fn(~Task) { unsafe { transmute(self) } }
6056
}
6157

6258
enum CleanupJob {
@@ -223,10 +219,8 @@ pub impl Scheduler {
223219
rtdebug!("blocking task");
224220

225221
let blocked_task = self.current_task.swap_unwrap();
226-
let f_fake_region = unsafe {
227-
transmute::<&fn(~Task), &fn(~Task)>(f)
228-
};
229-
let f_opaque = HackAroundBorrowCk::from_fn(f_fake_region);
222+
let f_fake_region = unsafe { transmute::<&fn(~Task), &fn(~Task)>(f) };
223+
let f_opaque = ClosureConverter::from_fn(f_fake_region);
230224
self.enqueue_cleanup_job(GiveTask(blocked_task, f_opaque));
231225

232226
local::put(self);

0 commit comments

Comments
 (0)