diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-08-20 20:00:26 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-08-27 18:47:58 -0700 |
| commit | 1ad2239f62031aaf5d8d046f1648cd91f8507f44 (patch) | |
| tree | 73475c56b02b83de2ce42f69cf4bf73c57651e52 | |
| parent | d9bb78efdf2fbb0de9ca43a8b14e5c91c78164e9 (diff) | |
| download | rust-1ad2239f62031aaf5d8d046f1648cd91f8507f44.tar.gz rust-1ad2239f62031aaf5d8d046f1648cd91f8507f44.zip | |
libstd: Fix merge fallout.
| -rw-r--r-- | src/libstd/rt/sched.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/uv/uvio.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index 5af0071f2ab..79fac4e8e8d 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -686,7 +686,7 @@ impl Scheduler { } pub fn run_task(task: ~Task) { - let sched = Local::take::<Scheduler>(); + let sched: ~Scheduler = Local::take(); sched.process_task(task, Scheduler::switch_task).map_move(Local::put); } diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index fac3de2be65..954bbc512d9 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -57,7 +57,7 @@ trait HomingIO { let old_home = Cell::new_empty(); let old_home_ptr = &old_home; do task::unkillable { // FIXME(#8674) - let scheduler = Local::take::<Scheduler>(); + let scheduler: ~Scheduler = Local::take(); do scheduler.deschedule_running_task_and_then |_, task| { // get the old home first do task.wake().map_move |mut task| { @@ -72,7 +72,7 @@ trait HomingIO { // unhome home do task::unkillable { // FIXME(#8674) - let scheduler = Local::take::<Scheduler>(); + let scheduler: ~Scheduler = Local::take(); do scheduler.deschedule_running_task_and_then |scheduler, task| { do task.wake().map_move |mut task| { task.give_home(old_home.take()); @@ -122,7 +122,7 @@ trait HomingIO { // get a handle for the current scheduler macro_rules! get_handle_to_current_scheduler( - () => (do Local::borrow::<Scheduler, SchedHandle> |sched| { sched.make_handle() }) + () => (do Local::borrow |sched: &mut Scheduler| { sched.make_handle() }) ) enum SocketNameKind { @@ -765,7 +765,7 @@ impl RtioTcpStream for UvTcpStream { unsafe { (*result_cell_ptr).put_back(result); } - let scheduler: ~Scheduler = Local::take::<Scheduler>(); + let scheduler: ~Scheduler = Local::take(); scheduler.resume_blocked_task_immediately(task_cell.take()); } } |