Merge pull request #5 from rsachdeva/chatty5

minor refactoring

Author: rsachdeva

chatty-tcp/src/connect/command.rs

@@ -6,6 +6,7 @@ use std::io::Write;
 use std::process;
 use tokio::io::{stdin, AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::tcp::OwnedWriteHalf;
+use tokio::select;
 use tokio::signal;
 use tracing::debug;
 
@@ -21,7 +22,7 @@ pub async fn send_command(writer_half: OwnedWriteHalf, username: String) -> Resu
     stdout().flush()?;
 
     loop {
-        tokio::select! {
+        select! {
             // Handle input from the user
             line = reader.next_line() => {
                 if let Ok(Some(line)) = line {

chatty-tcp/src/listen/command.rs

@@ -1,5 +1,5 @@
 use crate::listen::response::{
-    send_from_broadcast_channel_task, send_response, send_to_broadcast_channel,
+    send_from_broadcast_channel, send_response, send_to_broadcast_channel,
 };
 use crate::listen::state::RoomState;
 use anyhow::Result;
@@ -45,7 +45,7 @@ pub async fn process_command(
 
                 let chat_response = if !user_already_exist {
                     let rx = room_state.tx.subscribe();
-                    let send_task_handle = tokio::spawn(send_from_broadcast_channel_task(
+                    let send_task_handle = tokio::spawn(send_from_broadcast_channel(
                         writer.clone(),
                         rx,
                         username.clone(),

chatty-tcp/src/listen/response.rs

@@ -19,7 +19,7 @@ pub async fn send_to_broadcast_channel(
     Ok(())
 }
 
-pub async fn send_from_broadcast_channel_task(
+pub async fn send_from_broadcast_channel(
     writer: Arc<Mutex<OwnedWriteHalf>>,
     mut rx: broadcast::Receiver<ChatResponse>,
     username: String,
@@ -99,7 +99,7 @@ mod tests {
 
         let writer = Arc::new(Mutex::new(writer_half));
         let _handle = tokio::spawn(async move {
-            assert_ok!(send_from_broadcast_channel_task(writer, rx, "alice".to_string()).await);
+            assert_ok!(send_from_broadcast_channel(writer, rx, "alice".to_string()).await);
         });
 
         let (mut stream, _) = assert_ok!(listener.accept().await);
@@ -130,7 +130,7 @@ mod tests {
 
         let writer = Arc::new(Mutex::new(writer_half));
         let _handle = tokio::spawn(async move {
-            assert_ok!(send_from_broadcast_channel_task(writer, rx, "alice".to_string()).await);
+            assert_ok!(send_from_broadcast_channel(writer, rx, "alice".to_string()).await);
         });
 
         let (mut stream, _) = assert_ok!(listener.accept().await);