Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Pierre Krieger
2019-12-12 14:10:01 +01:00
4 changed files with 3 additions and 4 deletions

View File

@ -427,7 +427,6 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
ready!(self.as_mut().poll_flush(cx))?;
Pin::new(&mut self.io).poll_close(cx)
}
}
/// Read 2 bytes as frame length from the given source into the given buffer.