refactor: rename, also make EOF as a valid result

This commit is contained in:
Evgeny Safronov
2016-09-29 12:19:20 +03:00
parent fb497aba44
commit 4b3472ceae
2 changed files with 12 additions and 15 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ pub use self::copy::{copy, Copy};
pub use self::flush::{flush, Flush}; pub use self::flush::{flush, Flush};
pub use self::read_exact::{read_exact, ReadExact}; pub use self::read_exact::{read_exact, ReadExact};
pub use self::read_to_end::{read_to_end, ReadToEnd}; pub use self::read_to_end::{read_to_end, ReadToEnd};
pub use self::read::{read_some, ReadSome}; pub use self::read::{read, ReadSome};
pub use self::split::{ReadHalf, WriteHalf}; pub use self::split::{ReadHalf, WriteHalf};
pub use self::window::Window; pub use self::window::Window;
pub use self::write_all::{write_all, WriteAll}; pub use self::write_all::{write_all, WriteAll};
+11 -14
View File
@@ -11,24 +11,22 @@ enum State<R, T> {
Empty, Empty,
} }
fn eof() -> ::std::io::Error { /// Tries to read some bytes directly into the given `buf` in asynchronous
::std::io::Error::new(::std::io::ErrorKind::UnexpectedEof, "unexpected EOF") /// manner, returning a future type.
} ///
/// The returned future will resolve to both the I/O stream as well as the
/// Baz. /// buffer once the read operation is completed.
pub fn read_some<R, T>(rd: R, buf: T) -> ReadSome<R, T> pub fn read<R, T>(rd: R, buf: T) -> ReadSome<R, T>
where R: Read, where R: Read,
T: AsMut<[u8]> T: AsMut<[u8]>
{ {
ReadSome { ReadSome { state: State::Pending { rd: rd, buf: buf } }
state: State::Pending {
rd: rd,
buf: buf,
}
}
} }
/// Bar. /// A future which can be used to easily read available number of bytes to fill
/// a buffer.
///
/// Created by the [`read`] function.
pub struct ReadSome<R, T> { pub struct ReadSome<R, T> {
state: State<R, T>, state: State<R, T>,
} }
@@ -46,7 +44,6 @@ impl<R, T> Future for ReadSome<R, T>
let buf = buf.as_mut(); let buf = buf.as_mut();
match rd.read(&mut buf[..]) { match rd.read(&mut buf[..]) {
Ok(0) => return Err(eof()),
Ok(nread) => nread, Ok(nread) => nread,
Err(ref err) if err.kind() == ::std::io::ErrorKind::WouldBlock => { Err(ref err) if err.kind() == ::std::io::ErrorKind::WouldBlock => {
return Ok(Async::NotReady) return Ok(Async::NotReady)