Remove Error reimplementation for NatsError

jedisct1 · May 31, 2020 · b38f1ab · b38f1ab
1 parent e2dc545
commit b38f1ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/src/client.rs b/src/client.rs
@@ -14,7 +14,6 @@ use crate::tls_config::TlsConfig;
 use std::{
     cmp,
     collections::HashMap,
-    error::Error,
     io::{self, BufRead, BufReader, Write},
     net::TcpStream,
     thread,
@@ -386,7 +385,7 @@ impl Client {
                     NatsError::from((
                         TlsError,
                         "Failed to establish TLS connection",
-                        e.description().to_owned(),
+                        e.to_string(),
                     ))
                 })?;
             buf_reader = BufReader::new(stream_writer.try_clone()?);
@@ -543,7 +542,7 @@ impl Client {
                         return Err(NatsError::from((
                             ClientProtocolError,
                             "Failed to restore subscriptions",
-                            e.description().to_owned(),
+                            e.to_string(),
                         )));
                     }
                     e

diff --git a/src/errors.rs b/src/errors.rs
@@ -43,23 +43,7 @@ impl NatsError {
     }
 }
 
-impl Error for NatsError {
-    fn description(&self) -> &str {
-        match self.repr {
-            ErrorRepr::WithDescription(_, description)
-            | ErrorRepr::WithDescriptionAndDetail(_, description, _) => description,
-            ErrorRepr::IoError(ref e) => e.description(),
-            ErrorRepr::UrlParseError(ref e) => e.description(),
-        }
-    }
-
-    fn cause(&self) -> Option<&dyn Error> {
-        match self.repr {
-            ErrorRepr::IoError(ref e) => Some(e as &dyn Error),
-            _ => None,
-        }
-    }
-}
+impl Error for NatsError {}
 
 impl fmt::Display for NatsError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
@@ -111,11 +95,7 @@ impl From<io::Error> for NatsError {
 impl From<openssl::error::ErrorStack> for NatsError {
     fn from(e: openssl::error::ErrorStack) -> NatsError {
         NatsError {
-            repr: ErrorRepr::WithDescriptionAndDetail(
-                ErrorKind::TlsError,
-                "",
-                e.description().to_owned(),
-            ),
+            repr: ErrorRepr::WithDescriptionAndDetail(ErrorKind::TlsError, "", e.to_string()),
         }
     }
 }