Rename AsyncClient to Client

xmppftw created 2 years ago

Change summary

tokio-xmpp/ChangeLog                    | 1 +
tokio-xmpp/examples/contact_addr.rs     | 2 +-
tokio-xmpp/examples/download_avatars.rs | 2 +-
tokio-xmpp/examples/echo_bot.rs         | 2 +-
tokio-xmpp/src/connect/starttls.rs      | 4 ++--
tokio-xmpp/src/connect/tcp.rs           | 9 ++++++---
tokio-xmpp/src/lib.rs                   | 2 +-
xmpp/src/agent.rs                       | 2 +-
xmpp/src/builder.rs                     | 2 +-
xmpp/src/lib.rs                         | 2 +-
10 files changed, 16 insertions(+), 12 deletions(-)

Detailed changes

tokio-xmpp/ChangeLog

@@ -22,6 +22,7 @@ XXXX-YY-ZZ RELEASER <[e-mail]>
       - `Component` and `Client` now have `new_plaintext`, `new_starttls` and `new_with_connector` methods with same signature (!428)
         `new_plaintext` and `new_starttls` take a DnsConfig struct for SRV/DNS resolution strategy, while `new_with_connector` takes
         anything that implements ServerConnector
+      - `tokio_xmpp::AsyncClient` has been renamed `tokio_xmpp::Client` (!428)
 
 Version 4.0.0:
 2024-07-26 Maxime “pep” Buquet <[e-mail]>

tokio-xmpp/examples/contact_addr.rs

@@ -3,7 +3,7 @@ use minidom::Element;
 use std::env::args;
 use std::process::exit;
 use std::str::FromStr;
-use tokio_xmpp::AsyncClient as Client;
+use tokio_xmpp::Client;
 use xmpp_parsers::{
     disco::{DiscoInfoQuery, DiscoInfoResult},
     iq::{Iq, IqType},

tokio-xmpp/examples/download_avatars.rs

@@ -5,7 +5,7 @@ use std::fs::{create_dir_all, File};
 use std::io::{self, Write};
 use std::process::exit;
 use std::str::FromStr;
-use tokio_xmpp::AsyncClient as Client;
+use tokio_xmpp::Client;
 use xmpp_parsers::{
     avatar::{Data as AvatarData, Metadata as AvatarMetadata},
     caps::{compute_disco, hash_caps, Caps},

tokio-xmpp/examples/echo_bot.rs

@@ -3,7 +3,7 @@ use minidom::Element;
 use std::env::args;
 use std::process::exit;
 use std::str::FromStr;
-use tokio_xmpp::AsyncClient as Client;
+use tokio_xmpp::Client;
 use xmpp_parsers::jid::{BareJid, Jid};
 use xmpp_parsers::message::{Body, Message, MessageType};
 use xmpp_parsers::presence::{Presence, Show as PresenceShow, Type as PresenceType};

tokio-xmpp/src/connect/starttls.rs

@@ -40,11 +40,11 @@ use crate::{
     connect::{DnsConfig, ServerConnector, ServerConnectorError},
     error::{Error, ProtocolError},
     proto::{Packet, XmppStream},
-    AsyncClient, Component,
+    Client, Component,
 };
 
 /// Client that connects over StartTls
-pub type StartTlsClient = AsyncClient<StartTlsServerConnector>;
+pub type StartTlsClient = Client<StartTlsServerConnector>;
 /// Component that connects over StartTls
 pub type StartTlsComponent = Component<StartTlsServerConnector>;
 

tokio-xmpp/src/connect/tcp.rs

@@ -2,14 +2,17 @@
 
 use tokio::net::TcpStream;
 
-use crate::connect::DnsConfig;
-use crate::{connect::ServerConnector, proto::XmppStream, AsyncClient, Component, Error};
+use crate::{
+    connect::{DnsConfig, ServerConnector},
+    proto::XmppStream,
+    Client, Component, Error,
+};
 
 /// Component that connects over TCP
 pub type TcpComponent = Component<TcpServerConnector>;
 
 /// Client that connects over TCP
-pub type TcpClient = AsyncClient<TcpServerConnector>;
+pub type TcpClient = Client<TcpServerConnector>;
 
 /// Connect via insecure plaintext TCP to an XMPP server
 /// This should only be used over localhost or otherwise when you know what you are doing

tokio-xmpp/src/lib.rs

@@ -26,7 +26,7 @@ mod client;
 pub mod connect;
 pub mod proto;
 
-pub use client::async_client::Client as AsyncClient;
+pub use client::async_client::Client;
 mod component;
 pub use crate::component::Component;
 /// Detailed error types

xmpp/src/agent.rs

@@ -13,7 +13,7 @@ use tokio_xmpp::parsers::{disco::DiscoInfoResult, message::MessageType};
 pub use tokio_xmpp::{
     jid::{BareJid, FullJid, Jid},
     minidom::Element,
-    AsyncClient as TokioXmppClient,
+    Client as TokioXmppClient,
 };
 
 use crate::{event_loop, message, muc, upload, Error, Event, RoomNick};

xmpp/src/builder.rs

@@ -15,7 +15,7 @@ use tokio_xmpp::{
         disco::{DiscoInfoResult, Feature, Identity},
         ns,
     },
-    AsyncClient as TokioXmppClient,
+    Client as TokioXmppClient,
 };
 
 use crate::{Agent, ClientFeature};

xmpp/src/lib.rs

@@ -43,7 +43,7 @@ mod tests {
     use super::jid::BareJid;
     use super::{ClientBuilder, ClientFeature, ClientType, Event};
     use std::str::FromStr;
-    use tokio_xmpp::AsyncClient as TokioXmppClient;
+    use tokio_xmpp::Client as TokioXmppClient;
 
     #[tokio::test]
     async fn test_simple() {