clippy fixes

demostf · Apr 7, 2024 · a7a8318 · a7a8318
1 parent 490b4a0
commit a7a8318
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 30 deletions.
diff --git a/src/demo/message/packetentities.rs b/src/demo/message/packetentities.rs
@@ -231,9 +231,9 @@ fn test_bit_var_roundtrip() {
     bit_var_normal(u32::MAX);
 
     for i in 0..31 {
-        bit_var_normal(2u32.pow(i) as u32);
-        bit_var_normal(2u32.pow(i) as u32 - 1);
-        bit_var_normal(2u32.pow(i) as u32 + 1);
+        bit_var_normal(2u32.pow(i));
+        bit_var_normal(2u32.pow(i) - 1);
+        bit_var_normal(2u32.pow(i) + 1);
     }
 }
 

diff --git a/tests/entity.rs b/tests/entity.rs
@@ -88,21 +88,17 @@ impl MessageHandler for EntityDumper {
     type Output = Vec<EntityDump>;
 
     fn does_handle(message_type: MessageType) -> bool {
-        match message_type {
-            MessageType::PacketEntities => true,
-            _ => false,
-        }
+        matches!(message_type, MessageType::PacketEntities)
     }
 
     fn handle_message(&mut self, message: &Message, tick: DemoTick, _parser_state: &ParserState) {
-        match message {
-            Message::PacketEntities(entity_message) => self.entities.extend(
+        if let Message::PacketEntities(entity_message) = message {
+            self.entities.extend(
                 entity_message
                     .entities
                     .iter()
                     .map(|entity| (tick, entity.clone())),
-            ),
-            _ => {}
+            )
         }
     }
 

diff --git a/tests/message_reencode.rs b/tests/message_reencode.rs
@@ -6,6 +6,25 @@ use tf_demo_parser::demo::packet::Packet;
 use tf_demo_parser::demo::parser::{DemoHandler, Encode, NullHandler};
 use tf_demo_parser::{MessageType, Parse};
 
+fn setup_packet(handler: &mut DemoHandler<NullHandler>, input: &str) {
+    let data = fs::read(input).unwrap();
+    let mut stream = BitReadStream::new(BitReadBuffer::new_owned(data, LittleEndian));
+    let packet = Packet::parse(&mut stream, &handler.state_handler).unwrap();
+    handler.handle_packet(packet).unwrap();
+}
+
+fn setup_message(handler: &mut DemoHandler<NullHandler>, input: &str) {
+    let data = fs::read(input).unwrap();
+    let mut stream = BitReadStream::new(BitReadBuffer::new_owned(data, LittleEndian));
+    let message = Message::from_type(
+        MessageType::PacketEntities,
+        &mut stream,
+        &handler.state_handler,
+    )
+    .unwrap();
+    handler.handle_message(message, 0.into());
+}
+
 #[test_case("game_event_list.bin", MessageType::GameEventList, &[], &[]; "game_event_list")]
 #[test_case("packet_entities.bin", MessageType::PacketEntities, &["setup_data_tables.bin", "setup_string_tables.bin"], &[]; "packet_entities")]
 #[test_case("packet_entities_pov1.bin", MessageType::PacketEntities, &["setup_data_tables_pov.bin", "setup_string_tables_pov.bin"], &[]; "packet_entities_pov1")]
@@ -56,22 +75,3 @@ fn message_reencode(
         pretty_assertions::assert_eq!(data, out);
     }
 }
-
-fn setup_packet(handler: &mut DemoHandler<NullHandler>, input: &str) {
-    let data = fs::read(input).unwrap();
-    let mut stream = BitReadStream::new(BitReadBuffer::new_owned(data, LittleEndian));
-    let packet = Packet::parse(&mut stream, &handler.state_handler).unwrap();
-    handler.handle_packet(packet).unwrap();
-}
-
-fn setup_message(handler: &mut DemoHandler<NullHandler>, input: &str) {
-    let data = fs::read(input).unwrap();
-    let mut stream = BitReadStream::new(BitReadBuffer::new_owned(data, LittleEndian));
-    let message = Message::from_type(
-        MessageType::PacketEntities,
-        &mut stream,
-        &handler.state_handler,
-    )
-    .unwrap();
-    handler.handle_message(message, 0.into());
-}