From fab99c90044dcbdc25e1c31b7597e1575554e0b5 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 20 Feb 2018 16:53:42 +0100
Subject: [PATCH] error: Remove std::error::Error implementation as it
 conflicts with failure.

---
 Cargo.toml   |  4 ++--
 src/error.rs | 16 ----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1f1ab4b..1223902 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,8 +13,8 @@ categories = ["parsing", "network-programming"]
 license = "MPL-2.0"
 
 [dependencies]
-minidom = { version = "0.7.0" }
-jid = { version = "0.4.0", features = ["minidom"] }
+minidom = { version = "0.8.0" }
+jid = { version = "0.5.0", features = ["minidom"] }
 base64 = "0.9.0"
 digest = "0.7.1"
 sha-1 = "0.7.0"
diff --git a/src/error.rs b/src/error.rs
index f8d7372..912ad02 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -9,7 +9,6 @@ use std::io;
 use std::num;
 use std::string;
 use std::fmt;
-use std::error;
 
 use base64;
 use minidom;
@@ -43,21 +42,6 @@ impl fmt::Display for Error {
     }
 }
 
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        match *self {
-            Error::ParseError(s) => s,
-            Error::IoError(ref e) => e.description(),
-            Error::XMLError(ref e) => e.description(),
-            Error::Base64Error(ref e) => e.description(),
-            Error::ParseIntError(ref e) => e.description(),
-            Error::ParseStringError(ref e) => e.description(),
-            Error::JidParseError(_) => "JID parse error",
-            Error::ChronoParseError(ref e) => e.description(),
-        }
-    }
-}
-
 impl From<io::Error> for Error {
     fn from(err: io::Error) -> Error {
         Error::IoError(err)