forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hmmmmm two tests are failing... handshake and get_with_204_response

Browse Source
This commit is contained in:
Oliver Gould
2017-07-13 03:47:31 +00:00
parent 052ff83e24
commit cc97653fd7
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/proto/settings.rs
View File

@@ -66,6 +66,7 @@ impl<T, U> Settings<T>
}
fn try_send_pending(&mut self) -> Poll<(), ConnectionError> {
trace!("try_send_pending; dirty={} acks={}", self.is_dirty, self.remaining_acks);
if self.is_dirty {
let frame = frame::Settings::new(self.local.clone());
try_ready!(self.try_send(frame));
@@ -84,15 +85,13 @@ impl<T, U> Settings<T>
}
fn try_send(&mut self, item: frame::Settings) -> Poll<(), ConnectionError> {
if let AsyncSink::NotReady(_) = try!(self.inner.start_send(item.into())) {
// TODO: I don't think this is needed actually... It was originally
// done to "satisfy the start_send" contract...
try!(self.inner.poll_complete());
return Ok(Async::NotReady);
trace!("try_send");
if self.inner.start_send(item.into())?.is_ready() {
Ok(Async::Ready(()))
} else {
Ok(Async::NotReady)
}
Ok(Async::Ready(()))
}
}
@@ -146,7 +145,7 @@ impl<T, U> Sink for Settings<T>
}
fn poll_complete(&mut self) -> Poll<(), ConnectionError> {
trace!("Settings::poll_complete");
trace!("poll_complete");
try_ready!(self.try_send_pending());
self.inner.poll_complete()
}
@@ -162,11 +161,9 @@ impl<T, U> ReadySink for Settings<T>
T: ReadySink,
{
fn poll_ready(&mut self) -> Poll<(), ConnectionError> {
if try!(self.try_send_pending()).is_ready() {
return self.inner.poll_ready();
}
Ok(Async::NotReady)
trace!("poll_ready");
try_ready!(self.try_send_pending());
self.inner.poll_ready()
}
}