Merge pull request #222 from yawara/remove-anyhow

Remove `anyhow` dependency

Author: yawara

cameleon/Cargo.toml

@@ -25,7 +25,6 @@ tracing = "0.1.26"
 auto_impl = "1.0.1"
 cameleon-device = { path = "../device", version = "0.1.14" }
 cameleon-genapi = { path = "../genapi", version = "0.1.14" }
-anyhow = "1.0.40"
 
 [dev-dependencies]
 trybuild = "1.0.42"

cameleon/src/lib.rs

@@ -183,6 +183,27 @@ pub enum CameleonError {
 /// A specialized `Result` type for device control.
 pub type ControlResult<T> = std::result::Result<T, ControlError>;
 
+/// An error detail for communication with a device.
+#[derive(Debug, thiserror::Error)]
+pub enum DeviceIoError {
+    /// Underlying transport error.
+    #[cfg(feature = "libusb")]
+    #[error(transparent)]
+    Transport(#[from] cameleon_device::u3v::Error),
+
+    /// Protocol or runtime error represented as a message.
+    #[error("{0}")]
+    Message(Cow<'static, str>),
+}
+
+impl DeviceIoError {
+    /// Constructs [`DeviceIoError::Message`].
+    #[must_use]
+    pub fn msg(msg: impl Into<Cow<'static, str>>) -> Self {
+        Self::Message(msg.into())
+    }
+}
+
 /// An error type for device control.
 #[derive(Debug, thiserror::Error)]
 pub enum ControlError {
@@ -196,7 +217,7 @@ pub enum ControlError {
 
     /// IO error.
     #[error("input/output error: {0}")]
-    Io(anyhow::Error),
+    Io(DeviceIoError),
 
     /// Timeout has occured when receiving stream payload.
     #[error("timeout has occured when receiving stream payload")]
@@ -244,7 +265,7 @@ pub enum StreamError {
 
     /// IO error.
     #[error("can't communicate with the device: {0}")]
-    Io(anyhow::Error),
+    Io(DeviceIoError),
 
     /// Timeout has occured when receiving stream payload.
     #[error("timeout has occured when receiving stream payload")]

cameleon/src/u3v/control_handle.rs

@@ -19,7 +19,9 @@ use tracing::error;
 
 use super::register_map::{self, Abrm, ManifestTable, Sbrm, Sirm};
 
-use crate::{camera::DeviceControl, genapi::CompressionType, ControlError, ControlResult};
+use crate::{
+    camera::DeviceControl, genapi::CompressionType, ControlError, ControlResult, DeviceIoError,
+};
 
 /// Initial timeout duration for transaction between device and host.
 /// This value is temporarily used until the device's bootstrap register value is read.
@@ -273,7 +275,7 @@ impl ControlHandle {
                 .unwrap()
                 .scd_as()?)
         } else {
-            Err(ControlError::Io(anyhow::Error::msg(
+            Err(ControlError::Io(DeviceIoError::msg(
                 "the number of times pending was returned exceeds the retry_count.",
             )))
         }
@@ -282,14 +284,14 @@ impl ControlHandle {
     fn verify_ack(&self, ack: &ack::AckPacket) -> ControlResult<()> {
         let status = ack.status().kind();
         if status != ack::StatusKind::GenCp(ack::GenCpStatus::Success) {
-            return Err(ControlError::Io(anyhow::Error::msg(format!(
+            return Err(ControlError::Io(DeviceIoError::msg(format!(
                 "invalid status: {:?}",
                 ack.status().kind()
             ))));
         }
 
         if ack.request_id() != self.next_req_id {
-            return Err(ControlError::Io(anyhow::Error::msg("request id mismatch")));
+            return Err(ControlError::Io(DeviceIoError::msg("request id mismatch")));
         }
 
         Ok(())
@@ -363,7 +365,7 @@ impl DeviceControl for ControlHandle {
 
             if ack.length as usize != chunk_data_len {
                 let err_msg = "write mem failed: written length mismatch";
-                return Err(ControlError::Io(anyhow::Error::msg(err_msg)));
+                return Err(ControlError::Io(DeviceIoError::msg(err_msg)));
             }
         }
 

cameleon/src/u3v/mod.rs

@@ -57,7 +57,8 @@ pub use cameleon_device::u3v::DeviceInfo;
 use cameleon_device::u3v;
 
 use super::{
-    genapi::DefaultGenApiCtxt, CameleonResult, Camera, CameraInfo, ControlError, StreamError,
+    genapi::DefaultGenApiCtxt, CameleonResult, Camera, CameraInfo, ControlError, DeviceIoError,
+    StreamError,
 };
 
 /// Enumerate all U3V compatible cameras connected to the host.
@@ -112,13 +113,15 @@ impl From<u3v::Error> for ControlError {
         match &err {
             LibUsb(libusb_error) => match libusb_error {
                 Io | InvalidParam | Access | Overflow | Pipe | Interrupted | NoMem
-                | NotSupported | BadDescriptor | Other => ControlError::Io(err.into()),
+                | NotSupported | BadDescriptor | Other => {
+                    ControlError::Io(DeviceIoError::from(err))
+                }
                 Busy => ControlError::Busy,
                 NoDevice | NotFound => ControlError::Disconnected,
                 Timeout => ControlError::Timeout,
             },
 
-            BufferIo(_) | InvalidPacket(_) => ControlError::Io(err.into()),
+            BufferIo(_) | InvalidPacket(_) => ControlError::Io(DeviceIoError::from(err)),
 
             InvalidDevice => ControlError::InvalidDevice("invalid device".into()),
         }
@@ -136,11 +139,11 @@ impl From<u3v::Error> for StreamError {
         match &err {
             LibUsb(libusb_error) => match libusb_error {
                 Io | InvalidParam | Access | Overflow | Pipe | Interrupted | NoMem
-                | NotSupported | BadDescriptor | Busy | Other => Self::Io(err.into()),
+                | NotSupported | BadDescriptor | Busy | Other => Self::Io(DeviceIoError::from(err)),
                 NoDevice | NotFound => Self::Disconnected,
                 Timeout => Self::Timeout,
             },
-            _ => Self::Io(err.into()),
+            _ => Self::Io(DeviceIoError::from(err)),
         }
     }
 }

cameleon/src/u3v/stream_handle.rs

@@ -17,7 +17,7 @@ use tracing::{error, info, warn};
 use crate::{
     camera::PayloadStream,
     payload::{ImageInfo, Payload, PayloadSender, PayloadType},
-    ControlError, ControlResult, DeviceControl, StreamError, StreamResult,
+    ControlError, ControlResult, DeviceControl, DeviceIoError, StreamError, StreamResult,
 };
 
 use super::register_map::Abrm;
@@ -89,7 +89,7 @@ impl PayloadStream for StreamHandle {
         ctrl: &mut dyn DeviceControl,
     ) -> StreamResult<()> {
         self.params = StreamParams::from_control(ctrl).map_err(|e| {
-            StreamError::Io(anyhow::Error::msg(format!(
+            StreamError::Io(DeviceIoError::msg(format!(
                 "failed to setup streaming parameters: {e}"
             )))
         })?;