diff --git a/embedded-io-adapters/Cargo.toml b/embedded-io-adapters/Cargo.toml index ea88ee65..8bb87679 100644 --- a/embedded-io-adapters/Cargo.toml +++ b/embedded-io-adapters/Cargo.toml @@ -2,7 +2,7 @@ name = "embedded-io-adapters" version = "0.6.2" edition = "2021" -rust-version = "1.60" +rust-version = "1.81" description = "Adapters between the `embedded-io` traits and other I/O traits" repository = "https://github.com/rust-embedded/embedded-hal" readme = "README.md" diff --git a/embedded-io-adapters/src/std.rs b/embedded-io-adapters/src/std.rs index a76c005d..776bc875 100644 --- a/embedded-io-adapters/src/std.rs +++ b/embedded-io-adapters/src/std.rs @@ -102,6 +102,10 @@ impl embedded_io::Seek for FromStd { fn stream_position(&mut self) -> Result { self.inner.stream_position() } + + fn seek_relative(&mut self, offset: i64) -> Result<(), Self::Error> { + self.inner.seek_relative(offset) + } } /// Adapter to `std::io` traits. @@ -167,10 +171,9 @@ impl std::io::Write for ToStd { fn write_fmt(&mut self, fmt: core::fmt::Arguments<'_>) -> Result<(), std::io::Error> { match self.inner.write_fmt(fmt) { Ok(()) => Ok(()), - Err(e @ embedded_io::WriteFmtError::FmtError) => Err(std::io::Error::new( - std::io::ErrorKind::Other, - format!("{e:?}"), - )), + Err(e @ embedded_io::WriteFmtError::FmtError) => { + Err(std::io::Error::other(format!("{e:?}"))) + } Err(embedded_io::WriteFmtError::Other(e)) => Err(to_std_error(e)), } } @@ -192,6 +195,10 @@ impl std::io::Seek for ToStd { fn stream_position(&mut self) -> Result { self.inner.stream_position().map_err(to_std_error) } + + fn seek_relative(&mut self, offset: i64) -> std::io::Result<()> { + self.inner.seek_relative(offset).map_err(to_std_error) + } } /// Convert a embedded-io error to a [`std::io::Error`]