xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jingle_s5b: Make Candidate.host an IpAddr instead of a String.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-05-04 21:19:40 +02:00
commit 53e23cbf65
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/error.rs
View file

@ -9,6 +9,7 @@ use std::io;
use std::num;
use std::string;
use std::fmt;
use std::net;
use base64;
use minidom;
@ -23,6 +24,7 @@ pub enum Error {
Base64Error(base64::DecodeError),
ParseIntError(num::ParseIntError),
ParseStringError(string::ParseError),
ParseAddrError(net::AddrParseError),
JidParseError(jid::JidParseError),
ChronoParseError(chrono::ParseError),
}
@ -36,6 +38,7 @@ impl fmt::Display for Error {
Error::Base64Error(ref e) => write!(fmt, "{}", e),
Error::ParseIntError(ref e) => write!(fmt, "{}", e),
Error::ParseStringError(ref e) => write!(fmt, "{}", e),
Error::ParseAddrError(ref e) => write!(fmt, "{}", e),
Error::JidParseError(_) => write!(fmt, "JID parse error"),
Error::ChronoParseError(ref e) => write!(fmt, "{}", e),
}
@ -72,6 +75,12 @@ impl From<string::ParseError> for Error {
}
}
impl From<net::AddrParseError> for Error {
fn from(err: net::AddrParseError) -> Error {
Error::ParseAddrError(err)
}
}
impl From<jid::JidParseError> for Error {
fn from(err: jid::JidParseError) -> Error {
Error::JidParseError(err)