Flatten euphoxide::client hierarchy

euphoxide-bot/src/command.rs

@@ -9,10 +9,7 @@ use std::{future::Future, sync::Arc};
 use async_trait::async_trait;
 use euphoxide::{
     api::{self, Data, Message, MessageId, SendEvent, SendReply},
-    client::{
+    client::{ClientConnHandle, Joined, State},
-        conn::ClientConnHandle,
-        state::{Joined, State},
-    },
 };
 use euphoxide_client::{Client, MultiClient, MultiClientEvent};
 

euphoxide-client/examples/examplebot_multi.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use euphoxide::{
     api::{Data, Message, Nick, Send},
-    client::conn::ClientConnHandle,
+    client::ClientConnHandle,
 };
 use euphoxide_client::{MultiClient, MultiClientEvent};
 use tokio::sync::mpsc;

euphoxide-client/examples/examplebot_single.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use euphoxide::{
     api::{Data, Message, Nick, Send},
-    client::conn::ClientConnHandle,
+    client::ClientConnHandle,
 };
 use euphoxide_client::{Client, ClientEvent};
 use tokio::sync::mpsc;

euphoxide-client/src/config.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use cookie::CookieJar;
-use euphoxide::client::conn::ClientConnConfig;
+use euphoxide::client::ClientConnConfig;
 
 #[derive(Debug, Clone)]
 #[non_exhaustive]

euphoxide-client/src/multi.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use euphoxide::{
     api::ParsedPacket,
-    client::{conn::ClientConnHandle, state::State},
+    client::{ClientConnHandle, State},
 };
 use jiff::Timestamp;
 use tokio::{

euphoxide-client/src/single.rs

@@ -3,10 +3,7 @@ use std::{fmt, result, str::FromStr, sync::Arc};
 use cookie::Cookie;
 use euphoxide::{
     api::{Auth, AuthOption, BounceEvent, Data, Nick, ParsedPacket},
-    client::{
+    client::{ClientConn, ClientConnHandle, State},
-        conn::{ClientConn, ClientConnHandle},
-        state::State,
-    },
 };
 use jiff::Timestamp;
 use log::warn;

euphoxide/examples/examplebot.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use euphoxide::{
     api::{Data, Message, Nick, Send},
-    client::conn::{ClientConn, ClientConnHandle},
+    client::{ClientConn, ClientConnHandle},
 };
 
 async fn set_nick(conn: &ClientConnHandle) -> anyhow::Result<()> {

euphoxide/src/client.rs

@@ -1,4 +1,6 @@
 //! A connection from a client's perspective.
 
-pub mod conn;
+mod conn;
-pub mod state;
+mod state;
+
+pub use self::{conn::*, state::*};