Skip to content

Commit

Permalink
Fix merge fallout
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Aug 28, 2013
1 parent 2ad05ae commit 4635644
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libstd/rt/uv/uvio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -889,11 +889,11 @@ impl Drop for UvTcpStream {
// FIXME(#4330): should not need a transmute
let this = unsafe { cast::transmute_mut(self) };
do this.home_for_io |self_| {
let scheduler = Local::take::<Scheduler>();
let scheduler: ~Scheduler = Local::take();
do scheduler.deschedule_running_task_and_then |_, task| {
let task_cell = Cell::new(task);
do self_.watcher.as_stream().close {
let scheduler = Local::take::<Scheduler>();
let scheduler: ~Scheduler = Local::take();
scheduler.resume_blocked_task_immediately(task_cell.take());
}
}
Expand Down Expand Up @@ -1387,7 +1387,7 @@ impl Drop for UvProcess {
let this = unsafe { cast::transmute_mut(self) };

let close = |self_: &mut UvProcess| {
let scheduler = Local::take::<Scheduler>();
let scheduler: ~Scheduler = Local::take();
do scheduler.deschedule_running_task_and_then |_, task| {
let task = Cell::new(task);
do self_.process.close {
Expand Down

5 comments on commit 4635644

@bors
Copy link
Contributor

@bors bors commented on 4635644 Aug 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at alexcrichton@4635644

@bors
Copy link
Contributor

@bors bors commented on 4635644 Aug 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/issue-6436-run-non-blocking = 4635644 into auto

@bors
Copy link
Contributor

@bors bors commented on 4635644 Aug 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/issue-6436-run-non-blocking = 4635644 merged ok, testing candidate = b8d1fa3

@bors
Copy link
Contributor

@bors bors commented on 4635644 Aug 28, 2013

@bors
Copy link
Contributor

@bors bors commented on 4635644 Aug 28, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = b8d1fa3

Please sign in to comment.