itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-10-01 12:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #204 from fafhrd91/master

Browse Source 
drop inner borrow before dropping task
This commit is contained in:
Alex Crichton 2017-05-08 18:17:32 -05:00 committed by GitHub
commit 05191f14d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/reactor/mod.rs
View File

@ -364,6 +364,7 @@ impl Core {
}; };
drop(inner); drop(inner);
let res = CURRENT_LOOP.set(self, || task.poll_future(wake)); let res = CURRENT_LOOP.set(self, || task.poll_future(wake));
let _task_to_drop;
inner = self.inner.borrow_mut(); inner = self.inner.borrow_mut();
match res { match res {
Ok(Async::NotReady) => { Ok(Async::NotReady) => {
@ -372,9 +373,10 @@ impl Core {
} }
Ok(Async::Ready(())) | Ok(Async::Ready(())) |
Err(()) => { Err(()) => {
inner.task_dispatch.remove(token).unwrap(); _task_to_drop = inner.task_dispatch.remove(token).unwrap();
} }
} }
drop(inner);
} }
fn consume_timeouts(&mut self, now: Instant) { fn consume_timeouts(&mut self, now: Instant) {