From e867364d42477ecf3dc48e6fd787dff96cb6fadf Mon Sep 17 00:00:00 2001
From: alexmoon <alex.r.moon@gmail.com>
Date: Tue, 5 Apr 2022 22:04:11 -0400
Subject: Unify ReadError and WriteError into EndpointError

---
 examples/nrf/src/bin/usb_serial.rs           | 19 +++++--------------
 examples/nrf/src/bin/usb_serial_multitask.rs | 19 +++++--------------
 2 files changed, 10 insertions(+), 28 deletions(-)

(limited to 'examples')

diff --git a/examples/nrf/src/bin/usb_serial.rs b/examples/nrf/src/bin/usb_serial.rs
index 500be2ce8..684322837 100644
--- a/examples/nrf/src/bin/usb_serial.rs
+++ b/examples/nrf/src/bin/usb_serial.rs
@@ -10,7 +10,7 @@ use embassy_nrf::interrupt;
 use embassy_nrf::pac;
 use embassy_nrf::usb::{Driver, Instance};
 use embassy_nrf::Peripherals;
-use embassy_usb::driver::{ReadError, WriteError};
+use embassy_usb::driver::EndpointError;
 use embassy_usb::{Config, UsbDeviceBuilder};
 use embassy_usb_serial::{CdcAcmClass, State};
 use futures::future::join;
@@ -82,20 +82,11 @@ async fn main(_spawner: Spawner, p: Peripherals) {
 
 struct Disconnected {}
 
-impl From<ReadError> for Disconnected {
-    fn from(val: ReadError) -> Self {
+impl From<EndpointError> for Disconnected {
+    fn from(val: EndpointError) -> Self {
         match val {
-            ReadError::BufferOverflow => panic!("Buffer overflow"),
-            ReadError::Disabled => Disconnected {},
-        }
-    }
-}
-
-impl From<WriteError> for Disconnected {
-    fn from(val: WriteError) -> Self {
-        match val {
-            WriteError::BufferOverflow => panic!("Buffer overflow"),
-            WriteError::Disabled => Disconnected {},
+            EndpointError::BufferOverflow => panic!("Buffer overflow"),
+            EndpointError::Disabled => Disconnected {},
         }
     }
 }
diff --git a/examples/nrf/src/bin/usb_serial_multitask.rs b/examples/nrf/src/bin/usb_serial_multitask.rs
index 1258bc53d..bfb09014c 100644
--- a/examples/nrf/src/bin/usb_serial_multitask.rs
+++ b/examples/nrf/src/bin/usb_serial_multitask.rs
@@ -11,7 +11,7 @@ use embassy_nrf::pac;
 use embassy_nrf::usb::Driver;
 use embassy_nrf::Peripherals;
 use embassy_nrf::{interrupt, peripherals};
-use embassy_usb::driver::{ReadError, WriteError};
+use embassy_usb::driver::EndpointError;
 use embassy_usb::{Config, UsbDevice, UsbDeviceBuilder};
 use embassy_usb_serial::{CdcAcmClass, State};
 
@@ -93,20 +93,11 @@ async fn main(spawner: Spawner, p: Peripherals) {
 
 struct Disconnected {}
 
-impl From<ReadError> for Disconnected {
-    fn from(val: ReadError) -> Self {
+impl From<EndpointError> for Disconnected {
+    fn from(val: EndpointError) -> Self {
         match val {
-            ReadError::BufferOverflow => panic!("Buffer overflow"),
-            ReadError::Disabled => Disconnected {},
-        }
-    }
-}
-
-impl From<WriteError> for Disconnected {
-    fn from(val: WriteError) -> Self {
-        match val {
-            WriteError::BufferOverflow => panic!("Buffer overflow"),
-            WriteError::Disabled => Disconnected {},
+            EndpointError::BufferOverflow => panic!("Buffer overflow"),
+            EndpointError::Disabled => Disconnected {},
         }
     }
 }
-- 
cgit