From 62e9dcc02293e0d77fc94b4f4cc079979d58daca Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 16 Jan 2019 14:35:38 +0100 Subject: [PATCH] Bump xmpp-parsers to 0.12.2. This also removes minidom, jid and try_from as direct dependencies, since they are now reexported by xmpp-parsers. --- 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(-) diff --git a/Cargo.toml b/Cargo.toml index e43d5d28..c397ed40 100644 --- a/Cargo.toml +++ b/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" diff --git a/examples/echo_bot.rs b/examples/echo_bot.rs index 80ffc97f..24b10107 100644 --- a/examples/echo_bot.rs +++ b/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}; diff --git a/examples/echo_component.rs b/examples/echo_component.rs index 348b06a4..618032e3 100644 --- a/examples/echo_component.rs +++ b/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}; diff --git a/src/client/auth.rs b/src/client/auth.rs index 588b1a73..d961f7a0 100644 --- a/src/client/auth.rs +++ b/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; diff --git a/src/client/bind.rs b/src/client/bind.rs index 3758a563..083650b9 100644 --- a/src/client/bind.rs +++ b/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}; diff --git a/src/client/mod.rs b/src/client/mod.rs index 146d51a4..acc60441 100644 --- a/src/client/mod.rs +++ b/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; diff --git a/src/component/mod.rs b/src/component/mod.rs index aac66ab4..cfc1ee5e 100644 --- a/src/component/mod.rs +++ b/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; diff --git a/src/error.rs b/src/error.rs index e7fad549..9697f268 100644 --- a/src/error.rs +++ b/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 diff --git a/src/event.rs b/src/event.rs index 7a225ba3..94dd36c2 100644 --- a/src/event.rs +++ b/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)] diff --git a/src/starttls.rs b/src/starttls.rs index e48d1824..00966ac1 100644 --- a/src/starttls.rs +++ b/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}; diff --git a/src/stream_start.rs b/src/stream_start.rs index 0a5945b7..bf2d39e8 100644 --- a/src/stream_start.rs +++ b/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}; diff --git a/src/xmpp_codec.rs b/src/xmpp_codec.rs index 69ab5fc2..54ddcb51 100644 --- a/src/xmpp_codec.rs +++ b/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; diff --git a/src/xmpp_stream.rs b/src/xmpp_stream.rs index c67cc1ef..129dd1d4 100644 --- a/src/xmpp_stream.rs +++ b/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};