Remove usage of deprecated std::error::Error methods (#1206) (#1245)

2 files changed, 8 insertions, 23 deletions

diff --git a/tokio-timer/src/deadline.rs b/tokio-timer/src/deadline.rs
index 29f0c827..9df67da6 100644
--- a/tokio-timer/src/deadline.rs
+++ b/tokio-timer/src/deadline.rs
@@ -147,17 +147,7 @@ impl<T> DeadlineError<T> {
     }
 }
 
-impl<T: error::Error> error::Error for DeadlineError<T> {
-    fn description(&self) -> &str {
-        use self::Kind::*;
-
-        match self.0 {
-            Inner(ref e) => e.description(),
-            Elapsed => "deadline has elapsed",
-            Timer(ref e) => e.description(),
-        }
-    }
-}
+impl<T: error::Error> error::Error for DeadlineError<T> {}
 
 impl<T: fmt::Display> fmt::Display for DeadlineError<T> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
diff --git a/tokio-timer/src/error.rs b/tokio-timer/src/error.rs
index 968957fa..994eec1f 100644
--- a/tokio-timer/src/error.rs
+++ b/tokio-timer/src/error.rs
@@ -58,20 +58,15 @@ impl Error {
     }
 }
 
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        use self::Kind::*;
-
-        match self.0 {
-            Shutdown => "timer is shutdown",
-            AtCapacity => "timer is at capacity and cannot create a new entry",
-        }
-    }
-}
+impl error::Error for Error {}
 
 impl fmt::Display for Error {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use std::error::Error;
-        self.description().fmt(fmt)
+        use self::Kind::*;
+        let descr = match self.0 {
+            Shutdown => "timer is shutdown",
+            AtCapacity => "timer is at capacity and cannot create a new entry",
+        };
+        write!(fmt, "{}", descr)
     }
 }