format: Fix a few Clippy warnings

6 files changed, 22 insertions, 17 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 08ce080..ad5af70 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1,5 +1,4 @@
-use structopt::StructOpt;
-use structopt::clap::{Shell, App, AppSettings, SubCommand, Arg};
+use structopt::clap::{App, AppSettings, SubCommand, Arg};
 
 pub fn cli<'b, 'a>() -> App<'a, 'b> {
 	App::new(env!("CARGO_PKG_NAME"))
diff --git a/src/main.rs b/src/main.rs
index e3499b4..cb13cd7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use std::error::Error;
 use whirl::server::room::server::RoomServer;
 use whirl::config;
 use whirl::config::get_config;
-use structopt::clap::{SubCommand, AppSettings, App, Arg, Shell};
+use structopt::clap::Shell;
 use whirl::cli::cli;
 
 #[tokio::main]
@@ -53,17 +53,18 @@ async fn main() -> Result<(), Box<dyn Error>> {
 }
 
 async fn run() -> Result<(), Box<dyn Error>> {
-	let mut threads = vec![];
-	threads.push(tokio::spawn(async move {
-		let _ = AutoServer::new(
-			&*format!("0.0.0.0:{}", get_config().unwrap().auto_server_port)
-		).await;
-	}));
-	threads.push(tokio::spawn(async move {
-		let _ = RoomServer::new(
-			&*format!("0.0.0.0:{}", get_config().unwrap().room_server_port)
-		).await;
-	}));
+	let threads = vec![
+		tokio::spawn(async move {
+			let _ = AutoServer::listen(
+				&*format!("0.0.0.0:{}", get_config().unwrap().auto_server_port)
+			).await;
+		}),
+		tokio::spawn(async move {
+			let _ = RoomServer::listen(
+				&*format!("0.0.0.0:{}", get_config().unwrap().room_server_port)
+			).await;
+		}),
+	];
 	for thread in threads {
 		let _ = thread.await;
 	}
diff --git a/src/server/auto/cmd/session.rs b/src/server/auto/cmd/session.rs
index 290aac5..5592886 100644
--- a/src/server/auto/cmd/session.rs
+++ b/src/server/auto/cmd/session.rs
@@ -2,7 +2,7 @@ use crate::server::cmd::session::SessionInitializationCommand;
 use bytes::BytesMut;
 use std::str::from_utf8;
 
-struct SessionInitializationCommandServer {
+struct _SessionInitializationCommandServer {
 	pub error: usize,
 	pub app_name: String,
 	pub protocol: usize,
diff --git a/src/server/auto/server.rs b/src/server/auto/server.rs
index 6e33dd7..1a417f6 100644
--- a/src/server/auto/server.rs
+++ b/src/server/auto/server.rs
@@ -23,7 +23,7 @@ use crate::config::get_config;
 
 pub struct AutoServer;
 impl AutoServer {
-	pub async fn new(addr: &str) -> Result<(), Box<dyn Error>> {
+	pub async fn listen(addr: &str) -> Result<(), Box<dyn Error>> {
 		let listener = TcpListener::bind(addr).await?;
 		debug!("AutoServer now listening on {}", listener.local_addr().unwrap());
 		let state = Arc::new(Mutex::new(Shared::new()));
diff --git a/src/server/room/server.rs b/src/server/room/server.rs
index 415daab..2302085 100644
--- a/src/server/room/server.rs
+++ b/src/server/room/server.rs
@@ -23,7 +23,7 @@ use crate::server::cmd::property::parse_property_set_command;
 
 pub struct RoomServer;
 impl RoomServer {
-	pub async fn new(addr: &str) -> Result<(), Box<dyn Error>> {
+	pub async fn listen(addr: &str) -> Result<(), Box<dyn Error>> {
 		let listener = TcpListener::bind(addr).await?;
 		debug!("RoomServer now listening on {}", listener.local_addr().unwrap());
 		let state = Arc::new(Mutex::new(Shared::new()));
diff --git a/src/server/shared.rs b/src/server/shared.rs
index d7ff6c9..9e01d3d 100644
--- a/src/server/shared.rs
+++ b/src/server/shared.rs
@@ -33,3 +33,8 @@ impl Shared {
 	// 	}
 	// }
 }
+impl Default for Shared {
+	fn default() -> Self {
+		Self::new()
+	}
+}