pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

error: Remove std::error::Error implementation as it conflicts with failure.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-02-20 16:53:42 +01:00
parent 208e280067
commit fab99c9004
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -13,8 +13,8 @@ categories = ["parsing", "network-programming"]
license = "MPL-2.0" license = "MPL-2.0"
[dependencies] [dependencies]
minidom = { version = "0.7.0" } minidom = { version = "0.8.0" }
jid = { version = "0.4.0", features = ["minidom"] } jid = { version = "0.5.0", features = ["minidom"] }
base64 = "0.9.0" base64 = "0.9.0"
digest = "0.7.1" digest = "0.7.1"
sha-1 = "0.7.0" sha-1 = "0.7.0"

16
src/error.rs
View file

@ -9,7 +9,6 @@ use std::io;
use std::num; use std::num;
use std::string; use std::string;
use std::fmt; use std::fmt;
use std::error;
use base64; use base64;
use minidom; 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 { impl From<io::Error> for Error {
fn from(err: io::Error) -> Error { fn from(err: io::Error) -> Error {
Error::IoError(err) Error::IoError(err)