Merge branch 'bump-xmpp-parsers' into 'master'

Astro created 7 years ago

Bump xmpp-parsers to 0.12.2

See merge request xmpp-rs/tokio-xmpp!2

Change summary

Cargo.toml                 | 7 ++-----
examples/echo_bot.rs       | 4 +---
examples/echo_component.rs | 4 +---
src/client/auth.rs         | 2 +-
src/client/bind.rs         | 2 +-
src/client/mod.rs          | 3 +--
src/component/mod.rs       | 3 +--
src/error.rs               | 2 +-
src/event.rs               | 2 +-
src/starttls.rs            | 3 +--
src/stream_start.rs        | 3 +--
src/xmpp_codec.rs          | 2 +-
src/xmpp_stream.rs         | 3 +--
13 files changed, 14 insertions(+), 26 deletions(-)

Detailed changes

Cargo.toml

@@ -18,15 +18,12 @@ tokio-io = "0.1"
 tokio-codec = "0.1"
 bytes = "0.4"
 xml5ever = "0.12"
-minidom = "0.9"
 native-tls = "0.2"
 tokio-tls = "0.2"
 sasl = "0.4"
-jid = { version = "0.5", features = ["minidom"] }
 trust-dns-resolver = "0.9.1"
 trust-dns-proto = "0.4.0"
-xmpp-parsers = "0.11"
+xmpp-parsers = "0.12.2"
 idna = "0.1"
-try_from = "0.2"
-quick-xml = "0.12"
+quick-xml = "0.13"
 derive-error = "0.0.4"

examples/echo_bot.rs

@@ -1,11 +1,9 @@
 use futures::{future, Sink, Stream};
-use jid::Jid;
-use minidom::Element;
 use std::env::args;
 use std::process::exit;
 use tokio::runtime::current_thread::Runtime;
 use tokio_xmpp::Client;
-use try_from::TryFrom;
+use xmpp_parsers::{Jid, Element, TryFrom};
 use xmpp_parsers::message::{Body, Message, MessageType};
 use xmpp_parsers::presence::{Presence, Show as PresenceShow, Type as PresenceType};
 

examples/echo_component.rs

@@ -1,12 +1,10 @@
 use futures::{future, Sink, Stream};
-use jid::Jid;
-use minidom::Element;
 use std::env::args;
 use std::process::exit;
 use std::str::FromStr;
 use tokio::runtime::current_thread::Runtime;
 use tokio_xmpp::Component;
-use try_from::TryFrom;
+use xmpp_parsers::{Jid, Element, TryFrom};
 use xmpp_parsers::message::{Body, Message, MessageType};
 use xmpp_parsers::presence::{Presence, Show as PresenceShow, Type as PresenceType};
 

src/client/auth.rs

@@ -6,7 +6,7 @@ use sasl::client::Mechanism;
 use sasl::common::scram::{Sha1, Sha256};
 use sasl::common::Credentials;
 use tokio_io::{AsyncRead, AsyncWrite};
-use try_from::TryFrom;
+use xmpp_parsers::TryFrom;
 use xmpp_parsers::sasl::{Auth, Challenge, Failure, Mechanism as XMPPMechanism, Response, Success};
 
 use crate::xmpp_codec::Packet;

src/client/bind.rs

@@ -1,7 +1,7 @@
 use futures::{sink, Async, Future, Poll, Stream};
 use std::mem::replace;
 use tokio_io::{AsyncRead, AsyncWrite};
-use try_from::TryFrom;
+use xmpp_parsers::TryFrom;
 use xmpp_parsers::bind::Bind;
 use xmpp_parsers::iq::{Iq, IqType};
 

src/client/mod.rs

@@ -1,7 +1,6 @@
 use futures::{done, Async, AsyncSink, Future, Poll, Sink, StartSend, Stream};
 use idna;
-use jid::{Jid, JidParseError};
-use minidom::Element;
+use xmpp_parsers::{Jid, JidParseError, Element};
 use sasl::common::{ChannelBinding, Credentials};
 use std::mem::replace;
 use std::str::FromStr;

src/component/mod.rs

@@ -2,8 +2,7 @@
 //! XMPP server under a JID consisting of just a domain name. They are
 //! allowed to use any user and resource identifiers in their stanzas.
 use futures::{done, Async, AsyncSink, Future, Poll, Sink, StartSend, Stream};
-use jid::{Jid, JidParseError};
-use minidom::Element;
+use xmpp_parsers::{Jid, JidParseError, Element};
 use std::mem::replace;
 use std::str::FromStr;
 use tokio::net::TcpStream;

src/error.rs

@@ -7,7 +7,7 @@ use std::str::Utf8Error;
 use trust_dns_proto::error::ProtoError;
 use trust_dns_resolver::error::ResolveError;
 
-use xmpp_parsers::error::Error as ParsersError;
+use xmpp_parsers::Error as ParsersError;
 use xmpp_parsers::sasl::DefinedCondition as SaslDefinedCondition;
 
 /// Top-level error type

src/event.rs

@@ -1,4 +1,4 @@
-use minidom::Element;
+use xmpp_parsers::Element;
 
 /// High-level event on the Stream implemented by Client and Component
 #[derive(Debug)]

src/starttls.rs

@@ -1,8 +1,7 @@
 use futures::sink;
 use futures::stream::Stream;
 use futures::{Async, Future, Poll, Sink};
-use jid::Jid;
-use minidom::Element;
+use xmpp_parsers::{Jid, Element};
 use native_tls::TlsConnector as NativeTlsConnector;
 use std::mem::replace;
 use tokio_io::{AsyncRead, AsyncWrite};

src/stream_start.rs

@@ -1,6 +1,5 @@
 use futures::{sink, Async, Future, Poll, Sink, Stream};
-use jid::Jid;
-use minidom::Element;
+use xmpp_parsers::{Jid, Element};
 use std::mem::replace;
 use tokio_codec::Framed;
 use tokio_io::{AsyncRead, AsyncWrite};

src/xmpp_codec.rs

@@ -2,7 +2,7 @@
 
 use crate::{ParseError, ParserError};
 use bytes::{BufMut, BytesMut};
-use minidom::Element;
+use xmpp_parsers::Element;
 use quick_xml::Writer as EventWriter;
 use std;
 use std::cell::RefCell;

src/xmpp_stream.rs

@@ -2,8 +2,7 @@
 
 use futures::sink::Send;
 use futures::{Poll, Sink, StartSend, Stream};
-use jid::Jid;
-use minidom::Element;
+use xmpp_parsers::{Jid, Element};
 use tokio_codec::Framed;
 use tokio_io::{AsyncRead, AsyncWrite};