WriteAllError is going away in eio 0.6

esp-rs · Sep 25, 2023 · 5ce040a · 5ce040a
1 parent 414bccb
commit 5ce040a
Showing 1 changed file with 28 additions and 17 deletions.
diff --git a/src/utils/io.rs b/src/utils/io.rs
@@ -1,4 +1,6 @@
-use crate::io::{Read, Write, WriteAllError};
+use embedded_io::Error;
+
+use crate::io::{Read, Write};
 
 pub fn try_read_full<R: Read>(mut read: R, buf: &mut [u8]) -> Result<usize, (R::Error, usize)> {
     let mut offset = 0;
@@ -23,7 +25,6 @@ pub fn try_read_full<R: Read>(mut read: R, buf: &mut [u8]) -> Result<usize, (R::
 pub enum CopyError<R, W> {
     Read(R),
     Write(W),
-    WriteAll(WriteAllError<W>),
 }
 
 impl<R: core::fmt::Debug, W: core::fmt::Debug> core::fmt::Display for CopyError<R, W> {
@@ -36,19 +37,18 @@ impl<R: core::fmt::Debug, W: core::fmt::Debug> core::fmt::Display for CopyError<
 #[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl<R: core::fmt::Debug, W: core::fmt::Debug> std::error::Error for CopyError<R, W> {}
 
-// impl<R, W> Error for CopyError<R, W>
-// where
-//     R: Error,
-//     W: Error,
-// {
-//     fn kind(&self) -> embedded_io::ErrorKind {
-//         match self {
-//             Self::Read(e) => e.kind(),
-//             Self::Write(e) => e.kind(),
-//             Self::WriteAll(e) => e.kind(),
-//         }
-//     }
-// }
+impl<R, W> Error for CopyError<R, W>
+where
+    R: Error,
+    W: Error,
+{
+    fn kind(&self) -> embedded_io::ErrorKind {
+        match self {
+            Self::Read(e) => e.kind(),
+            Self::Write(e) => e.kind(),
+        }
+    }
+}
 
 pub fn copy<R, W>(read: R, write: W, buf: &mut [u8]) -> Result<u64, CopyError<R::Error, W::Error>>
 where
@@ -95,7 +95,8 @@ where
 
         write
             .write_all(&buf[0..size_read])
-            .map_err(CopyError::WriteAll)?;
+            .map_err(map_write_err)
+            .map_err(CopyError::Write)?;
 
         copied += size_read as u64;
         len -= size_read as u64;
@@ -106,10 +107,19 @@ where
     Ok(copied)
 }
 
+pub(crate) fn map_write_err<W>(e: embedded_io::WriteAllError<W>) -> W {
+    match e {
+        embedded_io::WriteAllError::WriteZero => panic!("write() returned Ok(0)"),
+        embedded_io::WriteAllError::Other(e) => e,
+    }
+}
+
 #[cfg(feature = "nightly")]
 pub mod asynch {
     use crate::io::asynch::{Read, Write};
 
+    use super::map_write_err;
+
     pub use super::CopyError;
 
     pub async fn try_read_full<R: Read>(
@@ -183,7 +193,8 @@ pub mod asynch {
             write
                 .write_all(&buf[0..size_read])
                 .await
-                .map_err(CopyError::WriteAll)?;
+                .map_err(map_write_err)
+                .map_err(CopyError::Write)?;
 
             copied += size_read as u64;
             len -= size_read as u64;