Merge pull request #47 from rust-embedded-community/fix/46/embedded-io-custom-buffers

Fixing embedded-io trait implementation

Author: eldruin

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+* Fixed an issue where the `embedded-io` traits were not implemented if custom buffers were used.
+
 ## [0.2.1] - 2024-03-06
 
 ### Added

src/io.rs

@@ -1,4 +1,5 @@
 use super::SerialPort;
+use core::borrow::BorrowMut;
 use usb_device::bus::UsbBus;
 
 #[derive(Debug)]
@@ -22,11 +23,15 @@ impl embedded_io::Error for Error {
     }
 }
 
-impl<Bus: UsbBus> embedded_io::ErrorType for SerialPort<'_, Bus> {
+impl<Bus: UsbBus, RS: BorrowMut<[u8]>, WS: BorrowMut<[u8]>> embedded_io::ErrorType
+    for SerialPort<'_, Bus, RS, WS>
+{
     type Error = Error;
 }
 
-impl<Bus: UsbBus> embedded_io::Read for SerialPort<'_, Bus> {
+impl<Bus: UsbBus, RS: BorrowMut<[u8]>, WS: BorrowMut<[u8]>> embedded_io::Read
+    for SerialPort<'_, Bus, RS, WS>
+{
     fn read(&mut self, buf: &mut [u8]) -> Result<usize, Self::Error> {
         loop {
             match self.read(buf).map_err(From::from) {
@@ -40,14 +45,18 @@ impl<Bus: UsbBus> embedded_io::Read for SerialPort<'_, Bus> {
     }
 }
 
-impl<Bus: UsbBus> embedded_io::ReadReady for SerialPort<'_, Bus> {
+impl<Bus: UsbBus, RS: BorrowMut<[u8]>, WS: BorrowMut<[u8]>> embedded_io::ReadReady
+    for SerialPort<'_, Bus, RS, WS>
+{
     fn read_ready(&mut self) -> Result<bool, Self::Error> {
         self.poll()?;
         Ok(self.read_buf.available_read() != 0)
     }
 }
 
-impl<Bus: UsbBus> embedded_io::Write for SerialPort<'_, Bus> {
+impl<Bus: UsbBus, RS: BorrowMut<[u8]>, WS: BorrowMut<[u8]>> embedded_io::Write
+    for SerialPort<'_, Bus, RS, WS>
+{
     fn write(&mut self, buf: &[u8]) -> Result<usize, Self::Error> {
         if buf.is_empty() {
             return Ok(0);
@@ -69,7 +78,9 @@ impl<Bus: UsbBus> embedded_io::Write for SerialPort<'_, Bus> {
     }
 }
 
-impl<Bus: UsbBus> embedded_io::WriteReady for SerialPort<'_, Bus> {
+impl<Bus: UsbBus, RS: BorrowMut<[u8]>, WS: BorrowMut<[u8]>> embedded_io::WriteReady
+    for SerialPort<'_, Bus, RS, WS>
+{
     fn write_ready(&mut self) -> Result<bool, Self::Error> {
         Ok(self.write_buf.available_write() != 0)
     }