From ce82eb571b0f48a59f3a94cf61af9ccd1beea438 Mon Sep 17 00:00:00 2001 From: hozan23 Date: Sat, 18 Nov 2023 00:54:09 +0300 Subject: clean up error module and use `transparent` attribute --- core/src/error.rs | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'core') diff --git a/core/src/error.rs b/core/src/error.rs index 15947c8..63b45d3 100644 --- a/core/src/error.rs +++ b/core/src/error.rs @@ -4,7 +4,7 @@ pub type Result = std::result::Result; #[derive(ThisError, Debug)] pub enum Error { - #[error("IO Error: {0}")] + #[error(transparent)] IO(#[from] std::io::Error), #[error("Timeout Error")] @@ -16,14 +16,14 @@ pub enum Error { #[error("Channel Send Error: {0}")] ChannelSend(String), - #[error("Channel Receive Error: {0}")] - ChannelRecv(String), + #[error(transparent)] + ChannelRecv(#[from] smol::channel::RecvError), - #[error("Decode Error: {0}")] - Decode(String), + #[error(transparent)] + BincodeDecode(#[from] bincode::error::DecodeError), - #[error("Encode Error: {0}")] - Encode(String), + #[error(transparent)] + BincodeEncode(#[from] bincode::error::EncodeError), } impl From> for Error { @@ -31,21 +31,3 @@ impl From> for Error { Error::ChannelSend(error.to_string()) } } - -impl From for Error { - fn from(error: smol::channel::RecvError) -> Self { - Error::ChannelRecv(error.to_string()) - } -} - -impl From for Error { - fn from(error: bincode::error::DecodeError) -> Self { - Error::Decode(error.to_string()) - } -} - -impl From for Error { - fn from(error: bincode::error::EncodeError) -> Self { - Error::Encode(error.to_string()) - } -} -- cgit v1.2.3