clippy fixes

wasm/src/cut/entity.rs

@@ -1,10 +1,10 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use tf_demo_parser::demo::data::{DemoTick, ServerTick};
-use tf_demo_parser::demo::message::BaselineIndex;
 use tf_demo_parser::demo::message::packetentities::{
     EntityId, PacketEntitiesMessage, PacketEntity, UpdateType,
 };
+use tf_demo_parser::demo::message::BaselineIndex;
 use tf_demo_parser::demo::packet::datatable::ClassId;
 use tf_demo_parser::demo::sendprop::SendPropIdentifier;
 use tf_demo_parser::ParserState;

wasm/src/cut/mod.rs

@@ -4,7 +4,6 @@ mod string_tables;
 use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
 use std::cmp::min;
 use std::collections::BTreeSet;
-use std::convert::TryInto;
 use std::iter::once;
 use std::mem::take;
 use tf_demo_parser::demo::header::Header;
@@ -35,7 +34,7 @@ pub fn cut(input: &[u8], options: EditOptions) -> Vec<u8> {
     {
         let mut out_stream = BitWriteStream::new(&mut out_buffer, LittleEndian);
 
-        let demo = Demo::new(&input);
+        let demo = Demo::new(input);
         let spectator_id = find_stv(&demo).unwrap_or_else(|| EntityId::from(1u32));
         let mut stream = demo.get_stream();
         let mut header = Header::read(&mut stream).unwrap();
@@ -76,7 +75,7 @@ pub fn cut(input: &[u8], options: EditOptions) -> Vec<u8> {
             .table_updates
             .encode()
             .into_iter()
-            .map(|msg| Message::UpdateStringTable(msg));
+            .map(Message::UpdateStringTable);
         let (baseline_updates, entity_update, removed_update) = start_state.entities.encode(
             &start_handler.state_handler,
             delta_tick - 2,
@@ -108,15 +107,14 @@ pub fn cut(input: &[u8], options: EditOptions) -> Vec<u8> {
         // create the net ticks needed for later deltas
         let fill_ticks = (delta_tick + 1)
             .range_inclusive(start_state.server_tick)
-            .into_iter()
+            .map(net_tick);
-            .map(|tick| net_tick(tick));
         let fill_packets = fill_ticks.map(|msg| {
             Packet::Message(MessagePacket {
                 messages: vec![
                     msg,
                     Message::PacketEntities(PacketEntitiesMessage {
                         max_entries: start_state.entity_max,
-                        delta: Some((delta_tick - 1).try_into().unwrap()),
+                        delta: Some(delta_tick - 1),
                         ..PacketEntitiesMessage::default()
                     }),
                 ],
@@ -152,7 +150,7 @@ pub fn cut(input: &[u8], options: EditOptions) -> Vec<u8> {
         }
         PacketType::Stop.write(&mut out_stream).unwrap();
         StopPacket {
-            tick: (end_tick - start_tick).into(),
+            tick: end_tick - start_tick,
         }
         .encode(&mut out_stream, &handler.state_handler)
         .unwrap();
@@ -188,7 +186,7 @@ fn skip_start<'a>(
         } else if packet.packet_type() != PacketType::ConsoleCmd {
             if let Packet::Message(message_packet) = &packet {
                 for msg in &message_packet.messages {
-                    table_updates.handle_message(&msg);
+                    table_updates.handle_message(msg);
                     match msg {
                         Message::PacketEntities(msg) => {
                             if let Some(delta) = msg.delta {

wasm/src/cut/string_tables.rs

@@ -15,14 +15,11 @@ pub struct StringTablesUpdates {
 
 impl StringTablesUpdates {
     pub fn handle_message(&mut self, message: &Message) {
-        match message {
+        if let Message::UpdateStringTable(msg) = message {
-            Message::UpdateStringTable(msg) => {
+            let table = self.tables.entry(msg.table_id).or_default();
-                let table = self.tables.entry(msg.table_id).or_default();
+            for (id, entry) in &msg.entries {
-                for (id, entry) in &msg.entries {
+                table.entries.insert(*id, entry.to_owned());
-                    table.entries.insert(*id, entry.to_owned());
-                }
             }
-            _ => {}
         }
     }
 

wasm/src/lib.rs

@@ -54,7 +54,7 @@ pub fn edit(input: &[u8], options: EditOptions) -> Vec<u8> {
 
 #[wasm_bindgen]
 pub fn count_ticks(input: &[u8]) -> u32 {
-    let demo = Demo::new(&input);
+    let demo = Demo::new(input);
     let mut stream = demo.get_stream();
     let header = Header::read(&mut stream).unwrap();
 
@@ -77,7 +77,7 @@ fn no_cut(input: &[u8], options: EditOptions) -> Vec<u8> {
     {
         let mut out_stream = BitWriteStream::new(&mut out_buffer, LittleEndian);
 
-        let demo = Demo::new(&input);
+        let demo = Demo::new(input);
         let spectator_id = find_stv(&demo).unwrap_or_else(|| EntityId::from(1u32));
 
         let mut stream = demo.get_stream();

wasm/src/missing_preserve.rs

@@ -41,7 +41,7 @@ impl MessageMutator for RemoveInvalidPreserveEntity {
                 };
             }
             ent_message.removed_entities.retain(|id| {
-                if self.known_entities.borrow().contains(&id) {
+                if self.known_entities.borrow().contains(id) {
                     // just not deleting makes the demo play but seems like it could cause further issues
                     // having a Delete or Leave makes it crash further in the demo
 

wasm/src/options.rs

@@ -31,7 +31,7 @@ impl EditOptions {
 
         for cond_options in self.remove_conditions.iter() {
             let entity = if cond_options.entity > 0 {
-                Some(EntityId::from(cond_options.entity))
+                Some(cond_options.entity)
             } else {
                 None
             };