Skip to content

Commit

Permalink
Fix async compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
rmja committed Aug 26, 2023
1 parent 36186b8 commit 6cbacac
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/asynch/read.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use embedded_io_asynch::{Read, Write};
use embedded_io_async::{Read, Write, WriteAllError};

/// A buffered [`Read`]
///
Expand All @@ -24,7 +24,7 @@ impl<T: Read + Write> Write for BufferedRead<'_, T> {
self.inner.write(buf).await
}

async fn write_all(&mut self, buf: &[u8]) -> Result<(), Self::Error> {
async fn write_all(&mut self, buf: &[u8]) -> Result<(), WriteAllError<Self::Error>> {
self.inner.write_all(buf).await
}

Expand Down
8 changes: 6 additions & 2 deletions src/asynch/write.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use embedded_io_asynch::{Read, Write};
use embedded_io_async::{Read, Write, WriteAllError};

/// A buffered [`Write`]
///
Expand Down Expand Up @@ -57,7 +57,11 @@ impl<T: Write> Write for BufferedWrite<'_, T> {

async fn flush(&mut self) -> Result<(), Self::Error> {
if self.pos > 0 {
self.inner.write_all(&self.buf[..self.pos]).await?;
match self.inner.write_all(&self.buf[..self.pos]).await {
Ok(()) => {}
Err(WriteAllError::WriteZero) => {}
Err(WriteAllError::Other(e)) => return Err(e),
}
self.pos = 0;
}

Expand Down

0 comments on commit 6cbacac

Please sign in to comment.