From f24260b1a39e501df7fc9dc42b3ef5362e117601 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 5 Nov 2023 00:41:55 +0800 Subject: [PATCH] feat: fix clippy --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 299239e..90d6678 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -571,7 +571,7 @@ dependencies = [ [[package]] name = "room-rs" -version = "0.1.5" +version = "0.1.6" dependencies = [ "chrono", "futures-channel", diff --git a/Cargo.toml b/Cargo.toml index 8581a26..5dfb0b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "room-rs" -version = "0.1.5" +version = "0.1.6" authors = ["Hatter Jiang@Pixelbook "] edition = "2018" diff --git a/src/main.rs b/src/main.rs index 945ad73..4d9b0af 100644 --- a/src/main.rs +++ b/src/main.rs @@ -63,7 +63,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket Err(e) => { warning!("Parse message: from: {:?} - {:?}, failed: {}", handle_context.room_id, handle_context.client_id, e); RoomMessageDown::create_error_reply( - &None, format!("Message parse failed: {}, message: {}", e, msg)).send(&tx); + &None, format!("Message parse failed: {}, message: {}", e, msg)).send(tx); return Ok(()); } }; @@ -142,7 +142,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket warning!("Not in room: {:?} - {:?}", room_id, client_id); } } else { - client_not_in_room(&tx, addr); + client_not_in_room(tx, addr); } } RoomMessageType::Destroy => { @@ -158,7 +158,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket } } } else { - client_not_in_room(&tx, addr); + client_not_in_room(tx, addr); } } RoomMessageType::ListPeers => { @@ -170,9 +170,9 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket .map(|m| m.keys().cloned().collect::>()) .unwrap_or_else(Vec::new); let client_ids_data = serde_json::to_string(&client_ids)?; - RoomMessageDown::create_peerlist_message(&room_message.message_id, Some(client_ids_data)).send(&tx); + RoomMessageDown::create_peerlist_message(&room_message.message_id, Some(client_ids_data)).send(tx); } else { - client_not_in_room(&tx, addr); + client_not_in_room(tx, addr); } } RoomMessageType::Broadcast => { @@ -195,10 +195,10 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket } } RoomMessageDown::create_success_reply( - &room_message.message_id, format!("Send message to {} peers", sent_messages)).send(&tx); + &room_message.message_id, format!("Send message to {} peers", sent_messages)).send(tx); } } else { - client_not_in_room(&tx, addr); + client_not_in_room(tx, addr); } } RoomMessageType::Peer => { @@ -224,7 +224,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket } } } else { - client_not_in_room(&tx, addr); + client_not_in_room(tx, addr); } } } @@ -306,7 +306,7 @@ fn client_exit(handle_context: &HandleContext, room_id: &Option, client_ } else { let m = RoomMessageDown::create_peer_exit(&None, client_id.clone()); if let Ok(mm) = serde_json::to_string(&m) { - for (_client_id, client_addr) in client_map { + for client_addr in client_map.values_mut() { if let Some(client_tx) = handle_context.peer_map.lock().unwrap().get(client_addr) { client_tx.send_text(mm.clone()); }