diff options
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/borrowck.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/sched.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/borrowck.rs b/src/libstd/rt/borrowck.rs index e03a61226ad..9dc0abdfbd8 100644 --- a/src/libstd/rt/borrowck.rs +++ b/src/libstd/rt/borrowck.rs @@ -38,7 +38,7 @@ pub struct BorrowRecord { } fn try_take_task_borrow_list() -> Option<~[BorrowRecord]> { - do Local::borrow::<Task, Option<~[BorrowRecord]>> |task| { + do Local::borrow |task: &mut Task| { task.borrow_list.take() } } @@ -50,7 +50,7 @@ fn swap_task_borrow_list(f: &fn(~[BorrowRecord]) -> ~[BorrowRecord]) { }; let borrows = f(borrows); let borrows = Cell::new(borrows); - do Local::borrow::<Task, ()> |task| { + do Local::borrow |task: &mut Task| { task.borrow_list = Some(borrows.take()); } } diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index b1319321c19..5af0071f2ab 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -555,7 +555,7 @@ impl Scheduler { let current_task: &mut Task = match sched.cleanup_job { Some(CleanupJob { task: ref task, _ }) => { let task_ptr: *~Task = task; - transmute_mut_region(*transmute_mut_unsafe(task)) + transmute_mut_region(*transmute_mut_unsafe(task_ptr)) } None => { rtabort!("no cleanup job"); |
