Skip to content

Commit ae37eb9

Browse files
committed
libstd: Fix merge fallout.
1 parent 6f4bde9 commit ae37eb9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/libstd/rt/sched.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ impl Scheduler {
667667
}
668668

669669
pub fn run_task(task: ~Task) {
670-
let sched = Local::take::<Scheduler>();
670+
let sched: ~Scheduler = Local::take();
671671
sched.process_task(task, Scheduler::switch_task).map_move(Local::put);
672672
}
673673

src/libstd/rt/uv/uvio.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ trait HomingIO {
4949
// go home
5050
let old_home = Cell::new_empty();
5151
let old_home_ptr = &old_home;
52-
let scheduler = Local::take::<Scheduler>();
52+
let scheduler: ~Scheduler = Local::take();
5353
do scheduler.deschedule_running_task_and_then |_, task| {
5454
// get the old home first
5555
do task.wake().map_move |mut task| {
@@ -62,7 +62,7 @@ trait HomingIO {
6262
let a = io(self);
6363

6464
// unhome home
65-
let scheduler = Local::take::<Scheduler>();
65+
let scheduler: ~Scheduler = Local::take();
6666
do scheduler.deschedule_running_task_and_then |scheduler, task| {
6767
do task.wake().map_move |mut task| {
6868
task.give_home(old_home.take());
@@ -77,7 +77,7 @@ trait HomingIO {
7777

7878
// get a handle for the current scheduler
7979
macro_rules! get_handle_to_current_scheduler(
80-
() => (do Local::borrow::<Scheduler, SchedHandle> |sched| { sched.make_handle() })
80+
() => (do Local::borrow |sched: &mut Scheduler| { sched.make_handle() })
8181
)
8282

8383
enum SocketNameKind {
@@ -632,7 +632,7 @@ impl RtioTcpStream for UvTcpStream {
632632

633633
unsafe { (*result_cell_ptr).put_back(result); }
634634

635-
let scheduler: ~Scheduler = Local::take::<Scheduler>();
635+
let scheduler: ~Scheduler = Local::take();
636636
scheduler.resume_blocked_task_immediately(task_cell.take());
637637
}
638638
}

0 commit comments

Comments
 (0)