io: Fix FromStd::read_exact by mapping std::io::ErrorKind::UnexpectedEof to ReadExactError::UnexpectedEof

Author: Conaclos

embedded-io-adapters/src/std.rs

@@ -1,6 +1,6 @@
 //! Adapters to/from `std::io` traits.
 
-use embedded_io::Error as _;
+use embedded_io::{Error as _, ReadExactError};
 
 /// Adapter from `std::io` traits.
 #[derive(Clone)]
@@ -40,6 +40,16 @@ impl<T: std::io::Read + ?Sized> embedded_io::Read for FromStd<T> {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, Self::Error> {
         self.inner.read(buf)
     }
+
+    fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), ReadExactError<Self::Error>> {
+        match self.inner.read_exact(buf) {
+            Ok(()) => Ok(()),
+            Err(error) if error.kind() == std::io::ErrorKind::UnexpectedEof => {
+                Err(embedded_io::ReadExactError::UnexpectedEof)
+            }
+            Err(error) => Err(error.into()),
+        }
+    }
 }
 
 impl<T: std::io::BufRead + ?Sized> embedded_io::BufRead for FromStd<T> {
@@ -101,10 +111,21 @@ impl<T: ?Sized> ToStd<T> {
     }
 }
 
-impl<T: embedded_io::Read + ?Sized> std::io::Read for ToStd<T> {
+impl<T: embedded_io::Read + ?Sized> std::io::Read for ToStd<T>
+where
+    T::Error: Into<std::io::Error>,
+{
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, std::io::Error> {
         self.inner.read(buf).map_err(to_std_error)
     }
+
+    fn read_exact(&mut self, buf: &mut [u8]) -> std::io::Result<()> {
+        match self.inner.read_exact(buf) {
+            Ok(()) => Ok(()),
+            Err(ReadExactError::UnexpectedEof) => Err(std::io::ErrorKind::UnexpectedEof.into()),
+            Err(ReadExactError::Other(other)) => Err(other.into()),
+        }
+    }
 }
 
 impl<T: embedded_io::Write + ?Sized> std::io::Write for ToStd<T> {