clippy + fmt; start using if let chains

1 files changed, 6 insertions, 7 deletions

diff --git a/server/src/state.rs b/server/src/state.rs
index 6cdaa8f1..49b2467a 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -16,11 +16,11 @@
 
 */
 use crate::{
-    server::{AnnounceState, ConnectionData, GameServerExt, Server},
     ConnectionID,
+    server::{AnnounceState, ConnectionData, GameServerExt, Server},
 };
 use anyhow::Result;
-use hurrycurry_locale::{tre, trm, TrError};
+use hurrycurry_locale::{TrError, tre, trm};
 use hurrycurry_protocol::{Menu, Message, PacketC, PacketS, PlayerID, VERSION};
 use log::{debug, info, trace};
 
@@ -92,16 +92,15 @@ impl Server {
         conn: ConnectionID,
         packet: PacketS,
     ) -> Result<Vec<PacketC>, TrError> {
-        if let Some(p) = get_packet_player(&packet) {
-            if !self
+        if let Some(p) = get_packet_player(&packet)
+            && !self
                 .connections
                 .entry(conn)
                 .or_default()
                 .players
                 .contains(&p)
-            {
-                return Err(tre!("s.error.packet_sender_invalid"));
-            }
+        {
+            return Err(tre!("s.error.packet_sender_invalid"));
         }
         let mut replies = Vec::new();
         match &packet {