From e0516eeda995700d309edb766e54dd8f81a0c71e Mon Sep 17 00:00:00 2001 From: mwojcik Date: Fri, 27 Aug 2021 13:12:19 +0200 Subject: [PATCH] libio: removed custom read/write, moved to core_io --- src/libio/cursor.rs | 17 +++--- src/libio/lib.rs | 125 +------------------------------------------- src/libio/proto.rs | 6 +-- 3 files changed, 10 insertions(+), 138 deletions(-) diff --git a/src/libio/cursor.rs b/src/libio/cursor.rs index 174a287..c31c8da 100644 --- a/src/libio/cursor.rs +++ b/src/libio/cursor.rs @@ -1,4 +1,4 @@ -use ::{Read, Write}; +use core_io::{Read, Write, Error as IoError}; #[derive(Debug, Clone)] pub struct Cursor { @@ -39,9 +39,8 @@ impl Cursor { } impl> Read for Cursor { - type ReadError = !; - fn read(&mut self, buf: &mut [u8]) -> Result { + fn read(&mut self, buf: &mut [u8]) -> Result { let data = &self.inner.as_ref()[self.pos..]; let len = buf.len().min(data.len()); buf[..len].copy_from_slice(&data[..len]); @@ -51,10 +50,8 @@ impl> Read for Cursor { } impl Write for Cursor<&mut [u8]> { - type WriteError = !; - type FlushError = !; - fn write(&mut self, buf: &[u8]) -> Result { + fn write(&mut self, buf: &[u8]) -> Result { let data = &mut self.inner[self.pos..]; let len = buf.len().min(data.len()); data[..len].copy_from_slice(&buf[..len]); @@ -63,24 +60,22 @@ impl Write for Cursor<&mut [u8]> { } #[inline] - fn flush(&mut self) -> Result<(), Self::FlushError> { + fn flush(&mut self) -> Result<(), IoError> { Ok(()) } } #[cfg(feature = "alloc")] impl Write for Cursor<::alloc::Vec> { - type WriteError = !; - type FlushError = !; #[inline] - fn write(&mut self, buf: &[u8]) -> Result { + fn write(&mut self, buf: &[u8]) -> Result { self.inner.extend_from_slice(buf); Ok(buf.len()) } #[inline] - fn flush(&mut self) -> Result<(), Self::FlushError> { + fn flush(&mut self) -> Result<(), IoError> { Ok(()) } } diff --git a/src/libio/lib.rs b/src/libio/lib.rs index a58d990..e754be4 100644 --- a/src/libio/lib.rs +++ b/src/libio/lib.rs @@ -19,127 +19,4 @@ pub use cursor::Cursor; #[cfg(feature = "byteorder")] pub use proto::{ProtoRead, ProtoWrite}; #[cfg(all(feature = "byteorder", feature = "alloc"))] -pub use proto::ReadStringError; - -#[derive(Debug, Clone, PartialEq)] -pub enum Error { - UnexpectedEnd, - Other(T) -} - -impl From for Error { - fn from(value: T) -> Error { - Error::Other(value) - } -} - -pub trait Read { - type ReadError; - - /// Pull some bytes from this source into the specified buffer, returning - /// how many bytes were read. - fn read(&mut self, buf: &mut [u8]) -> Result; - - /// Read the exact number of bytes required to fill `buf`. - fn read_exact(&mut self, mut buf: &mut [u8]) -> Result<(), Error> { - while !buf.is_empty() { - let read_bytes = self.read(buf)?; - if read_bytes == 0 { - return Err(Error::UnexpectedEnd) - } - - buf = &mut { buf }[read_bytes..]; - } - - Ok(()) - } -} - -impl<'a, T: Read> Read for &'a mut T { - type ReadError = T::ReadError; - - fn read(&mut self, buf: &mut [u8]) -> Result { - T::read(self, buf) - } -} - -pub trait Write { - type WriteError; - type FlushError; - - /// Write a buffer into this object, returning how many bytes were written. - fn write(&mut self, buf: &[u8]) -> Result; - - /// Flush this output stream, ensuring that all intermediately buffered contents - /// reach their destination. - fn flush(&mut self) -> Result<(), Self::FlushError>; - - /// Attempts to write an entire buffer into `self`. - fn write_all(&mut self, mut buf: &[u8]) -> Result<(), Error> { - while buf.len() > 0 { - let written_bytes = self.write(buf)?; - if written_bytes == 0 { - return Err(Error::UnexpectedEnd) - } - - buf = &buf[written_bytes..]; - } - - Ok(()) - } - - /// Hints the writer how much bytes will be written after call to this function. - /// - /// At least `min` bytes should be written after the call to this function and - /// if `max` is `Some(x)` than at most `x` bytes should be written. - fn size_hint(&mut self, _min: usize, _max: Option) {} -} - -impl<'a, T: Write> Write for &'a mut T { - type WriteError = T::WriteError; - type FlushError = T::FlushError; - - fn write(&mut self, buf: &[u8]) -> Result { - T::write(self, buf) - } - - fn flush(&mut self) -> Result<(), Self::FlushError> { - T::flush(self) - } - - fn size_hint(&mut self, min: usize, max: Option) { - T::size_hint(self, min, max) - } -} - -impl<'a> Write for &'a mut [u8] { - type WriteError = !; - type FlushError = !; - - fn write(&mut self, buf: &[u8]) -> Result { - let len = buf.len().min(self.len()); - self[..len].copy_from_slice(&buf[..len]); - Ok(len) - } - - #[inline] - fn flush(&mut self) -> Result<(), Self::FlushError> { - Ok(()) - } -} - -#[cfg(feature = "alloc")] -impl<'a> Write for alloc::Vec { - type WriteError = !; - type FlushError = !; - - fn write(&mut self, buf: &[u8]) -> Result { - self.extend_from_slice(buf); - Ok(buf.len()) - } - - #[inline] - fn flush(&mut self) -> Result<(), Self::FlushError> { - Ok(()) - } -} +pub use proto::ReadStringError; \ No newline at end of file diff --git a/src/libio/proto.rs b/src/libio/proto.rs index 8ecf215..c165606 100644 --- a/src/libio/proto.rs +++ b/src/libio/proto.rs @@ -3,7 +3,7 @@ use byteorder::{ByteOrder, NativeEndian}; use alloc::vec; use alloc::string::String; -use ::{Read, Write, Error as IoError}; +use core_io::{Read, Write, Error as IoError}; #[allow(dead_code)] #[derive(Debug, Clone, PartialEq)] @@ -142,7 +142,7 @@ pub trait ProtoWrite { } impl ProtoRead for T where T: Read + ?Sized { - type ReadError = IoError; + type ReadError = IoError; fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), Self::ReadError> { T::read_exact(self, buf) @@ -150,7 +150,7 @@ impl ProtoRead for T where T: Read + ?Sized { } impl ProtoWrite for T where T: Write + ?Sized { - type WriteError = IoError; + type WriteError = IoError; fn write_all(&mut self, buf: &[u8]) -> Result<(), Self::WriteError> { T::write_all(self, buf)