1 files changed, 32 insertions, 65 deletions
diff --git a/jabber/src/error.rs b/jabber/src/error.rs
index 902061e..8c27cc9 100644
--- a/jabber/src/error.rs
+++ b/jabber/src/error.rs
@@ -5,83 +5,50 @@ use rsasl::mechname::MechanismNameError;
 use stanza::client::error::Error as ClientError;
 use stanza::sasl::Failure;
 use stanza::stream::Error as StreamError;
+use thiserror::Error;
 use tokio::task::JoinError;
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum Error {
+    #[error("connection")]
     Connection,
-    Utf8Decode,
+    #[error("utf8 decode: {0}")]
+    Utf8Decode(#[from] Utf8Error),
+    #[error("negotiation")]
     Negotiation,
+    #[error("tls required")]
     TlsRequired,
+    #[error("already connected with tls")]
     AlreadyTls,
+    // TODO: specify unsupported feature
+    #[error("unsupported feature")]
     Unsupported,
+    #[error("jid missing localpart")]
     NoLocalpart,
-    AlreadyConnecting,
-    StreamClosed,
+    #[error("received unexpected element: {0:?}")]
     UnexpectedElement(peanuts::Element),
-    XML(peanuts::Error),
-    Deserialization(peanuts::DeserializeError),
-    SASL(SASLError),
-    JID(ParseError),
-    Authentication(Failure),
-    ClientError(ClientError),
-    StreamError(StreamError),
+    #[error("xml error: {0}")]
+    XML(#[from] peanuts::Error),
+    #[error("sasl error: {0}")]
+    SASL(#[from] SASLError),
+    #[error("jid error: {0}")]
+    JID(#[from] ParseError),
+    #[error("client stanza error: {0}")]
+    ClientError(#[from] ClientError),
+    #[error("stream error: {0}")]
+    StreamError(#[from] StreamError),
+    #[error("error missing")]
     MissingError,
-    Disconnected,
-    Connecting,
-    JoinError(JoinError),
+    #[error("task join error")]
+    JoinError(#[from] JoinError),
 }
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum SASLError {
-    SASL(rsasl::prelude::SASLError),
-    MechanismName(MechanismNameError),
-}
-
-impl From<rsasl::prelude::SASLError> for Error {
-    fn from(e: rsasl::prelude::SASLError) -> Self {
-        Self::SASL(SASLError::SASL(e))
-    }
-}
-
-impl From<JoinError> for Error {
-    fn from(e: JoinError) -> Self {
-        Self::JoinError(e)
-    }
-}
-
-impl From<peanuts::DeserializeError> for Error {
-    fn from(e: peanuts::DeserializeError) -> Self {
-        Error::Deserialization(e)
-    }
-}
-
-impl From<MechanismNameError> for Error {
-    fn from(e: MechanismNameError) -> Self {
-        Self::SASL(SASLError::MechanismName(e))
-    }
-}
-
-impl From<SASLError> for Error {
-    fn from(e: SASLError) -> Self {
-        Self::SASL(e)
-    }
-}
-
-impl From<Utf8Error> for Error {
-    fn from(_e: Utf8Error) -> Self {
-        Self::Utf8Decode
-    }
-}
-
-impl From<peanuts::Error> for Error {
-    fn from(e: peanuts::Error) -> Self {
-        Self::XML(e)
-    }
-}
-
-impl From<ParseError> for Error {
-    fn from(e: ParseError) -> Self {
-        Self::JID(e)
-    }
+    #[error("sasl error: {0}")]
+    SASL(#[from] rsasl::prelude::SASLError),
+    #[error("mechanism error: {0}")]
+    MechanismName(#[from] MechanismNameError),
+    #[error("authentication failure: {0}")]
+    Authentication(#[from] Failure),
 }