Move SimpleClient constructors to client::simple_client module

xmppftw created 2 years ago

Change summary

tokio-xmpp/src/client/simple_client.rs | 15 +++++++++++++++
tokio-xmpp/src/starttls/client.rs      | 20 --------------------
tokio-xmpp/src/starttls/mod.rs         |  1 -
3 files changed, 15 insertions(+), 21 deletions(-)

Detailed changes

tokio-xmpp/src/client/simple_client.rs

@@ -1,11 +1,13 @@
 use futures::{sink::SinkExt, Sink, Stream};
 use minidom::Element;
 use std::pin::Pin;
+use std::str::FromStr;
 use std::task::{Context, Poll};
 use tokio_stream::StreamExt;
 use xmpp_parsers::{jid::Jid, ns, stream_features::StreamFeatures};
 
 use crate::connect::ServerConnector;
+use crate::starttls::ServerConfig;
 use crate::xmpp_codec::Packet;
 use crate::xmpp_stream::{add_stanza_id, XMPPStream};
 use crate::Error;
@@ -20,6 +22,19 @@ pub struct Client<C: ServerConnector> {
     stream: XMPPStream<C::Stream>,
 }
 
+impl Client<ServerConfig> {
+    /// Start a new XMPP client and wait for a usable session
+    pub async fn new<P: Into<String>>(jid: &str, password: P) -> Result<Self, Error> {
+        let jid = Jid::from_str(jid)?;
+        Self::new_with_jid(jid, password.into()).await
+    }
+
+    /// Start a new client given that the JID is already parsed.
+    pub async fn new_with_jid(jid: Jid, password: String) -> Result<Self, Error> {
+        Self::new_with_jid_connector(ServerConfig::UseSrv, jid, password).await
+    }
+}
+
 impl<C: ServerConnector> Client<C> {
     /// Start a new client given that the JID is already parsed.
     pub async fn new_with_jid_connector(

tokio-xmpp/src/starttls/client.rs

@@ -1,20 +0,0 @@
-use std::str::FromStr;
-
-use xmpp_parsers::jid::Jid;
-
-use crate::{Error, SimpleClient};
-
-use super::ServerConfig;
-
-impl SimpleClient<ServerConfig> {
-    /// Start a new XMPP client and wait for a usable session
-    pub async fn new<P: Into<String>>(jid: &str, password: P) -> Result<Self, Error> {
-        let jid = Jid::from_str(jid)?;
-        Self::new_with_jid(jid, password.into()).await
-    }
-
-    /// Start a new client given that the JID is already parsed.
-    pub async fn new_with_jid(jid: Jid, password: String) -> Result<Self, Error> {
-        Self::new_with_jid_connector(ServerConfig::UseSrv, jid, password).await
-    }
-}

tokio-xmpp/src/starttls/mod.rs

@@ -35,7 +35,6 @@ use crate::{connect::ServerConnectorError, xmpp_stream::XMPPStream};
 use self::error::Error as StartTlsError;
 use self::happy_eyeballs::{connect_to_host, connect_with_srv};
 
-mod client;
 pub mod error;
 mod happy_eyeballs;