From 5fc12c45b5d822734a6dbd1143afb880ea4ee418 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 24 Jul 2024 20:52:10 +0200 Subject: [PATCH] =?UTF-8?q?xmpp:=20Use=20tokio-xmpp=E2=80=99s=20reexports?= =?UTF-8?q?=20of=20jid=20and=20minidom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xmpp/examples/hello_bot.rs | 3 ++- xmpp/src/agent.rs | 6 +++++- xmpp/src/builder.rs | 3 ++- xmpp/src/delay.rs | 2 +- xmpp/src/disco/mod.rs | 2 +- xmpp/src/event.rs | 5 +++-- xmpp/src/iq/get.rs | 3 ++- xmpp/src/iq/result.rs | 3 ++- xmpp/src/iq/set.rs | 3 ++- xmpp/src/lib.rs | 6 ++++-- xmpp/src/message/receive/chat.rs | 2 +- xmpp/src/message/receive/group_chat.rs | 2 +- xmpp/src/message/send.rs | 2 +- xmpp/src/muc/private_message.rs | 2 +- xmpp/src/muc/room.rs | 2 +- xmpp/src/pubsub/avatar.rs | 2 +- xmpp/src/pubsub/mod.rs | 3 ++- xmpp/src/upload/receive.rs | 3 ++- xmpp/src/upload/send.rs | 2 +- 19 files changed, 35 insertions(+), 21 deletions(-) diff --git a/xmpp/examples/hello_bot.rs b/xmpp/examples/hello_bot.rs index a78d4905a5af0e278598c840238b19b8dc350396..bd12fa375a9b8dec006065ee0113999f9c8df72d 100644 --- a/xmpp/examples/hello_bot.rs +++ b/xmpp/examples/hello_bot.rs @@ -6,7 +6,8 @@ use std::env::args; use std::str::FromStr; -use tokio_xmpp::parsers::{message::MessageType, BareJid, Jid}; +use tokio_xmpp::jid::{BareJid, Jid}; +use tokio_xmpp::parsers::message::MessageType; use xmpp::{ClientBuilder, ClientFeature, ClientType, Event}; #[tokio::main] diff --git a/xmpp/src/agent.rs b/xmpp/src/agent.rs index df31db7a2baf55b118b11480eb299a96e86edde1..48d39cf367f906771052b3ef7aeb57821bff3d22 100644 --- a/xmpp/src/agent.rs +++ b/xmpp/src/agent.rs @@ -9,7 +9,11 @@ use std::sync::{Arc, RwLock}; use tokio_xmpp::connect::ServerConnector; pub use tokio_xmpp::parsers; use tokio_xmpp::parsers::{disco::DiscoInfoResult, message::MessageType}; -pub use tokio_xmpp::{AsyncClient as TokioXmppClient, BareJid, Element, FullJid, Jid}; +pub use tokio_xmpp::{ + jid::{BareJid, FullJid, Jid}, + minidom::Element, + AsyncClient as TokioXmppClient, +}; use crate::{event_loop, message, muc, upload, Error, Event, RoomNick}; diff --git a/xmpp/src/builder.rs b/xmpp/src/builder.rs index d416a1275ff6993501f60db225bc51f8373f2be1..73ceaab96093adc2a15bb783f1a39abf333ace0b 100644 --- a/xmpp/src/builder.rs +++ b/xmpp/src/builder.rs @@ -7,11 +7,12 @@ use std::sync::{Arc, RwLock}; use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::{BareJid, Jid}, parsers::{ disco::{DiscoInfoResult, Feature, Identity}, ns, }, - AsyncClient as TokioXmppClient, AsyncConfig, BareJid, Jid, + AsyncClient as TokioXmppClient, AsyncConfig, }; use crate::{Agent, ClientFeature}; diff --git a/xmpp/src/delay.rs b/xmpp/src/delay.rs index b45ea91cf1bbea0380b748a04c196691f9af6335..24982fe12f825b16332b704a04fb0a5d9ae77fe3 100644 --- a/xmpp/src/delay.rs +++ b/xmpp/src/delay.rs @@ -6,8 +6,8 @@ use chrono::{DateTime, Utc}; use tokio_xmpp::{ + jid::Jid, parsers::{delay::Delay, message::Message, ns}, - Jid, }; /// Time information associated with a stanza. diff --git a/xmpp/src/disco/mod.rs b/xmpp/src/disco/mod.rs index 3c76498a721efa3414b937d210e7d90f703dd69d..ee3312e38874b21b810efd07fae04dcf9ebc0be5 100644 --- a/xmpp/src/disco/mod.rs +++ b/xmpp/src/disco/mod.rs @@ -6,6 +6,7 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, parsers::{ bookmarks, disco::DiscoInfoResult, @@ -14,7 +15,6 @@ use tokio_xmpp::{ private::Query as PrivateXMLQuery, pubsub::pubsub::{Items, PubSub}, }, - Jid, }; use crate::Agent; diff --git a/xmpp/src/event.rs b/xmpp/src/event.rs index c7a8e3a24342225acd9750bcb68ad62339b2e56f..65d66e5a8686cfb9f58cffe52b6dc2c5239255a4 100644 --- a/xmpp/src/event.rs +++ b/xmpp/src/event.rs @@ -4,9 +4,10 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +use tokio_xmpp::jid::BareJid; #[cfg(feature = "avatars")] -use tokio_xmpp::parsers::Jid; -use tokio_xmpp::parsers::{bookmarks2, message::Body, roster::Item as RosterItem, BareJid}; +use tokio_xmpp::jid::Jid; +use tokio_xmpp::parsers::{bookmarks2, message::Body, roster::Item as RosterItem}; use crate::{delay::StanzaTimeInfo, Error, Id, RoomNick}; diff --git a/xmpp/src/iq/get.rs b/xmpp/src/iq/get.rs index f64a950fc6d77eb69e91ef259a7286a0931dbd34..cb9fb708265ae3f0189af51cd88294dd5e52a021 100644 --- a/xmpp/src/iq/get.rs +++ b/xmpp/src/iq/get.rs @@ -6,13 +6,14 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, + minidom::Element, parsers::{ disco::DiscoInfoQuery, iq::Iq, ns, stanza_error::{DefinedCondition, ErrorType, StanzaError}, }, - Element, Jid, }; use crate::{Agent, Event}; diff --git a/xmpp/src/iq/result.rs b/xmpp/src/iq/result.rs index 26d2ce51a410d8aa01e7bbbe93ad5de5e5b669b2..70eea320136ec101f304913d900ff058288ec2a1 100644 --- a/xmpp/src/iq/result.rs +++ b/xmpp/src/iq/result.rs @@ -6,8 +6,9 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, + minidom::Element, parsers::{disco::DiscoInfoResult, ns, private::Query as PrivateXMLQuery, roster::Roster}, - Element, Jid, }; use crate::{disco, pubsub, upload, Agent, Event}; diff --git a/xmpp/src/iq/set.rs b/xmpp/src/iq/set.rs index 4793d8d46ecb58a767edd317cf99cad5d307f6fb..821b45eeac92073d7cd787cf4118172c4d2f231e 100644 --- a/xmpp/src/iq/set.rs +++ b/xmpp/src/iq/set.rs @@ -6,11 +6,12 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, + minidom::Element, parsers::{ iq::Iq, stanza_error::{DefinedCondition, ErrorType, StanzaError}, }, - Element, Jid, }; use crate::{Agent, Event}; diff --git a/xmpp/src/lib.rs b/xmpp/src/lib.rs index 780fe4eb44abefd222a67dc679c1e9b06f0a110d..cff6612866936f6b3c78f247c385a2bf0c13a28e 100644 --- a/xmpp/src/lib.rs +++ b/xmpp/src/lib.rs @@ -6,8 +6,9 @@ #![deny(bare_trait_objects)] +pub use tokio_xmpp::jid; +pub use tokio_xmpp::minidom; pub use tokio_xmpp::parsers; -pub use tokio_xmpp::{BareJid, Element, FullJid, Jid}; #[macro_use] extern crate log; @@ -37,7 +38,8 @@ pub type RoomNick = String; #[cfg(all(test, any(feature = "starttls-rust", feature = "starttls-native")))] mod tests { - use super::{BareJid, ClientBuilder, ClientFeature, ClientType, Event}; + use super::jid::BareJid; + use super::{ClientBuilder, ClientFeature, ClientType, Event}; use std::str::FromStr; use tokio_xmpp::AsyncClient as TokioXmppClient; diff --git a/xmpp/src/message/receive/chat.rs b/xmpp/src/message/receive/chat.rs index e81f9a1fa9bf5d32f7b0e1933192712e46abcb10..da708a1d872a6174c47161f18a9fe4ee0137a795 100644 --- a/xmpp/src/message/receive/chat.rs +++ b/xmpp/src/message/receive/chat.rs @@ -6,8 +6,8 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, parsers::{message::Message, muc::user::MucUser}, - Jid, }; use crate::{delay::StanzaTimeInfo, Agent, Event}; diff --git a/xmpp/src/message/receive/group_chat.rs b/xmpp/src/message/receive/group_chat.rs index 2e5c90879fc30f31352c56527d5b98bbbb502528..66dfb8f714df53029663e7084d3dbf6505b4acf0 100644 --- a/xmpp/src/message/receive/group_chat.rs +++ b/xmpp/src/message/receive/group_chat.rs @@ -5,7 +5,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. use tokio_xmpp::connect::ServerConnector; -use tokio_xmpp::{parsers::message::Message, Jid}; +use tokio_xmpp::{jid::Jid, parsers::message::Message}; use crate::{delay::StanzaTimeInfo, Agent, Event}; diff --git a/xmpp/src/message/send.rs b/xmpp/src/message/send.rs index 877aca82180979bfaf0776b3e56925ff539d9a47..d099d2b011ba51e237094b01093445ce6b48005c 100644 --- a/xmpp/src/message/send.rs +++ b/xmpp/src/message/send.rs @@ -6,8 +6,8 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, parsers::message::{Body, Message, MessageType}, - Jid, }; use crate::Agent; diff --git a/xmpp/src/muc/private_message.rs b/xmpp/src/muc/private_message.rs index 7b5883ffb64723a9b7ebfd4a534fb14c297f3732..dc1ca7bb56ed70a56e941eb274ffb4777901b9bb 100644 --- a/xmpp/src/muc/private_message.rs +++ b/xmpp/src/muc/private_message.rs @@ -6,11 +6,11 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::{BareJid, Jid}, parsers::{ message::{Body, Message, MessageType}, muc::user::MucUser, }, - BareJid, Jid, }; use crate::{Agent, RoomNick}; diff --git a/xmpp/src/muc/room.rs b/xmpp/src/muc/room.rs index 17d73d1843f60ac84d1ce8bdcf4200c5dfea82be..96f62893b6a51a4bd39e614433dc9aadca527e98 100644 --- a/xmpp/src/muc/room.rs +++ b/xmpp/src/muc/room.rs @@ -6,11 +6,11 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::BareJid, parsers::{ muc::Muc, presence::{Presence, Type as PresenceType}, }, - BareJid, }; use crate::{Agent, RoomNick}; diff --git a/xmpp/src/pubsub/avatar.rs b/xmpp/src/pubsub/avatar.rs index 83728ad05c07038e6cf8f63a4818804adf0b15e4..3d522b5996c0bad51f9572c5b6ad1629f6c58de9 100644 --- a/xmpp/src/pubsub/avatar.rs +++ b/xmpp/src/pubsub/avatar.rs @@ -12,13 +12,13 @@ use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::parsers::{ avatar::{Data, Metadata}, iq::Iq, + jid::Jid, ns, pubsub::{ event::Item, pubsub::{Items, PubSub}, NodeName, }, - Jid, }; pub(crate) async fn handle_metadata_pubsub_event( diff --git a/xmpp/src/pubsub/mod.rs b/xmpp/src/pubsub/mod.rs index 921966ddffa9dac8a4dc3478d43118416535f8de..087022687cb9d1fc54f7bdc879b8b635425d79b2 100644 --- a/xmpp/src/pubsub/mod.rs +++ b/xmpp/src/pubsub/mod.rs @@ -9,12 +9,13 @@ use crate::Event; use std::str::FromStr; use tokio_xmpp::{ connect::ServerConnector, + jid::{BareJid, Jid}, + minidom::Element, parsers::{ bookmarks2::{self, Autojoin}, ns, pubsub::event::PubSubEvent, pubsub::pubsub::PubSub, - BareJid, Element, Jid, }, }; diff --git a/xmpp/src/upload/receive.rs b/xmpp/src/upload/receive.rs index ff6ef55742027a7ce4f5e3a4e1a539fe546f109c..9f2c712caefa43e60b7cf6d0f5d23d2e27ff98dc 100644 --- a/xmpp/src/upload/receive.rs +++ b/xmpp/src/upload/receive.rs @@ -12,8 +12,9 @@ use tokio::fs::File; use tokio_util::codec::{BytesCodec, FramedRead}; use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, + minidom::Element, parsers::http_upload::{Header as HttpUploadHeader, SlotResult}, - Element, Jid, }; use crate::{Agent, Event}; diff --git a/xmpp/src/upload/send.rs b/xmpp/src/upload/send.rs index 54edc90f8b1b46d60fc0cbf354b37b2851928127..c00e098c7f77907098a420a8de24ff97f2bda724 100644 --- a/xmpp/src/upload/send.rs +++ b/xmpp/src/upload/send.rs @@ -8,8 +8,8 @@ use std::path::Path; use tokio::fs::File; use tokio_xmpp::connect::ServerConnector; use tokio_xmpp::{ + jid::Jid, parsers::{http_upload::SlotRequest, iq::Iq}, - Jid, }; use crate::Agent;