mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-30 05:21:09 +00:00
Code Issues Projects Releases Wiki Activity

Revert "remove unnecessary use of unsafe in read_from_io"

Browse source 
This reverts commit da237611cb.
This commit is contained in:
Nikolay Kim 2018-06-22 08:55:19 +06:00
parent 3afdf3fa7e
commit 17c033030b
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/server/utils.rs
View file

@ -1,5 +1,5 @@
use bytes::{BufMut, BytesMut}; use bytes::{BufMut, BytesMut};
use futures::Poll; use futures::{Async, Poll};
use std::io; use std::io;
use super::IoStream; use super::IoStream;
@ -10,8 +10,22 @@ const HW_BUFFER_SIZE: usize = 32_768;
pub fn read_from_io<T: IoStream>( pub fn read_from_io<T: IoStream>(
io: &mut T, buf: &mut BytesMut, io: &mut T, buf: &mut BytesMut,
) -> Poll<usize, io::Error> { ) -> Poll<usize, io::Error> {
if buf.remaining_mut() < LW_BUFFER_SIZE { unsafe {
buf.reserve(HW_BUFFER_SIZE); if buf.remaining_mut() < LW_BUFFER_SIZE {
buf.reserve(HW_BUFFER_SIZE);
}
match io.read(buf.bytes_mut()) {
Ok(n) => {
buf.advance_mut(n);
Ok(Async::Ready(n))
}
Err(e) => {
if e.kind() == io::ErrorKind::WouldBlock {
Ok(Async::NotReady)
} else {
Err(e)
}
}
}
} }
io.read_buf(buf)
} }