tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-22 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on beta/nightly

Browse Source 
I believe this happened due to a very recent rustc soundness fix!

Closes #189
This commit is contained in:
Alex Crichton
2017-03-15 10:29:17 -07:00
parent e79f665440
commit 8c1838e093
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/tcp.rs
+20 -15
View File
@@ -513,20 +513,22 @@ impl<'a> AsyncRead for &'a TcpStream {
if let Async::NotReady = <TcpStream>::poll_read(self) {
return Err(::would_block())
}
let mut bufs: [_; 16] = Default::default();
unsafe {
let r = unsafe {
let mut bufs: [_; 16] = Default::default();
let n = buf.bytes_vec_mut(&mut bufs);
match self.io.get_ref().read_bufs(&mut bufs[..n]) {
Ok(n) => {
buf.advance_mut(n);
Ok(Async::Ready(n))
}
Err(e) => {
if e.kind() == io::ErrorKind::WouldBlock {
self.io.need_write();
}
Err(e)
self.io.get_ref().read_bufs(&mut bufs[..n])
};
match r {
Ok(n) => {
unsafe { buf.advance_mut(n); }
Ok(Async::Ready(n))
}
Err(e) => {
if e.kind() == io::ErrorKind::WouldBlock {
self.io.need_write();
}
Err(e)
}
}
}
@@ -541,9 +543,12 @@ impl<'a> AsyncWrite for &'a TcpStream {
if let Async::NotReady = <TcpStream>::poll_write(self) {
return Err(::would_block())
}
let mut bufs: [_; 16] = Default::default();
let n = buf.bytes_vec(&mut bufs);
match self.io.get_ref().write_bufs(&bufs[..n]) {
let r = {
let mut bufs: [_; 16] = Default::default();
let n = buf.bytes_vec(&mut bufs);
self.io.get_ref().write_bufs(&bufs[..n])
};
match r {
Ok(n) => {
buf.advance(n);
Ok(Async::Ready(n))