mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libstd: Fix merge fallout.

Browse Source
This commit is contained in:
Patrick Walton 2013-08-20 20:00:26 -07:00
parent d9bb78efdf
commit 1ad2239f62
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/rt/sched.rs
View File

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

8
src/libstd/rt/uv/uvio.rs
View File

@ -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());
}
}