diff --git a/xmpp/Cargo.toml b/xmpp/Cargo.toml index a99d8740..8ad9714a 100644 --- a/xmpp/Cargo.toml +++ b/xmpp/Cargo.toml @@ -14,8 +14,7 @@ license = "MPL-2.0" edition = "2018" [dependencies] -tokio-xmpp = "3.2" -xmpp-parsers = "0.19" +tokio-xmpp = "3.4" futures = "0.3" tokio = { version = "1", features = ["fs"] } log = "0.4" diff --git a/xmpp/examples/hello_bot.rs b/xmpp/examples/hello_bot.rs index 74b56c1a..0a6a93b4 100644 --- a/xmpp/examples/hello_bot.rs +++ b/xmpp/examples/hello_bot.rs @@ -7,8 +7,8 @@ use env_logger; use std::env::args; use std::str::FromStr; +use tokio_xmpp::parsers::{message::MessageType, BareJid, Jid}; use xmpp::{ClientBuilder, ClientFeature, ClientType, Event}; -use xmpp_parsers::{message::MessageType, BareJid, Jid}; #[tokio::main] async fn main() -> Result<(), Option<()>> { diff --git a/xmpp/src/lib.rs b/xmpp/src/lib.rs index 956d850d..6149116c 100644 --- a/xmpp/src/lib.rs +++ b/xmpp/src/lib.rs @@ -15,8 +15,7 @@ use std::path::{Path, PathBuf}; use std::sync::{Arc, RwLock}; use tokio::fs::File; use tokio_util::codec::{BytesCodec, FramedRead}; -use tokio_xmpp::{AsyncClient as TokioXmppClient, Event as TokioXmppEvent}; -use xmpp_parsers::{ +use tokio_xmpp::parsers::{ bookmarks2::Conference, caps::{compute_disco, hash_caps, Caps}, disco::{DiscoInfoQuery, DiscoInfoResult, Feature, Identity}, @@ -33,8 +32,9 @@ use xmpp_parsers::{ pubsub::pubsub::{Items, PubSub}, roster::{Item as RosterItem, Roster}, stanza_error::{DefinedCondition, ErrorType, StanzaError}, - BareJid, Element, Jid, }; +use tokio_xmpp::{AsyncClient as TokioXmppClient, Event as TokioXmppEvent}; +use tokio_xmpp::{BareJid, Element, Jid}; #[macro_use] extern crate log; diff --git a/xmpp/src/pubsub/avatar.rs b/xmpp/src/pubsub/avatar.rs index 54a5db79..d2c8aacd 100644 --- a/xmpp/src/pubsub/avatar.rs +++ b/xmpp/src/pubsub/avatar.rs @@ -9,7 +9,7 @@ use crate::Event; use std::convert::TryFrom; use std::fs::{self, File}; use std::io::{self, Write}; -use xmpp_parsers::{ +use tokio_xmpp::parsers::{ avatar::{Data, Metadata}, iq::Iq, ns, diff --git a/xmpp/src/pubsub/mod.rs b/xmpp/src/pubsub/mod.rs index f0a4b753..f0491577 100644 --- a/xmpp/src/pubsub/mod.rs +++ b/xmpp/src/pubsub/mod.rs @@ -8,7 +8,7 @@ use super::Agent; use crate::Event; use std::convert::TryFrom; use std::str::FromStr; -use xmpp_parsers::{ +use tokio_xmpp::parsers::{ bookmarks2::{Autojoin, Conference}, ns, pubsub::event::PubSubEvent,