libstd: Fix merge fallout.

Author: pcwalton

src/libstd/rt/sched.rs

@@ -667,7 +667,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);
     }
 

src/libstd/rt/uv/uvio.rs

@@ -49,7 +49,7 @@ trait HomingIO {
         // go home
         let old_home = Cell::new_empty();
         let old_home_ptr = &old_home;
-        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| {
@@ -62,7 +62,7 @@ trait HomingIO {
         let a = io(self);
 
         // unhome home
-        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());
@@ -77,7 +77,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 {
@@ -632,7 +632,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());
                 }
             }