cleanup

src/demo/message/bspdecal.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitstream_reader::{BitRead, LittleEndian};
 
 use crate::demo::sendprop::read_bit_coord;
 use crate::demo::vector::Vector;

src/demo/message/gameevent.rs

@@ -1,14 +1,14 @@
 use std::collections::HashMap;
 use std::iter::FromIterator;
 
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitstream_reader::{BitRead, LittleEndian};
 
 use crate::demo::gameevent_gen::GameEventType;
 use crate::demo::gamevent::{
     GameEvent, GameEventDefinition, GameEventEntry, GameEventValue, GameEventValueType,
     RawGameEvent,
 };
-use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
+use crate::{Parse, ParserState, ReadResult, Result, Stream};
 
 fn read_event_value(stream: &mut Stream, definition: &GameEventEntry) -> Result<GameEventValue> {
     Ok(match definition.kind {

src/demo/message/generated.rs

@@ -1,6 +1,6 @@
 use crate::Stream;
 /// Messages that consists only of primitives and string and can be derived
-use bitstream_reader::{BitRead, BitStream, LittleEndian};
+use bitstream_reader::{BitRead, LittleEndian};
 use std::collections::HashMap;
 
 #[derive(BitRead, Debug)]

src/demo/message/mod.rs

@@ -1,6 +1,3 @@
-use std::mem::discriminant;
-
-use bitstream_reader::{BitRead, LittleEndian};
 use enum_primitive_derive::Primitive;
 use num_traits::FromPrimitive;
 
@@ -9,13 +6,12 @@ pub use generated::*;
 use crate::demo::message::bspdecal::*;
 use crate::demo::message::classinfo::*;
 use crate::demo::message::gameevent::*;
-use crate::demo::message::generated::*;
 use crate::demo::message::packetentities::*;
 use crate::demo::message::stringtable::*;
 use crate::demo::message::tempentities::*;
 use crate::demo::message::usermessage::*;
 use crate::demo::message::voice::*;
-use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
+use crate::{Parse, ParseError, ParserState, Result, Stream};
 
 pub mod bspdecal;
 pub mod classinfo;

src/demo/message/packetentities.rs

@@ -1,9 +1,9 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitstream_reader::BitRead;
 use serde::Serialize;
 
 use crate::demo::packet::datatable::ServerClass;
 use crate::demo::sendprop::SendProp;
-use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
+use crate::{Parse, ParserState, Result, Stream};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize)]
 pub struct EntityId(u32);
@@ -45,14 +45,14 @@ pub struct PacketEntitiesMessage {
 }
 
 impl Parse for PacketEntitiesMessage {
-    fn parse(stream: &mut Stream, state: &ParserState) -> Result<Self> {
+    fn parse(stream: &mut Stream, _state: &ParserState) -> Result<Self> {
         let max_entries = stream.read_sized(11)?;
         let delta = stream.read()?;
         let base_line = stream.read_sized(1)?;
-        let updated_entries: u16 = stream.read_sized(11)?;
+        let _updated_entries: u16 = stream.read_sized(11)?;
         let length: u32 = stream.read_sized(20)?;
         let updated_base_line = stream.read()?;
-        let data = stream.read_bits(length as usize)?;
+        let _data = stream.read_bits(length as usize)?;
 
         // TODO
 

src/demo/message/stringtable.rs

@@ -1,13 +1,11 @@
-use std::collections::HashMap;
-
-use bitstream_reader::{BitBuffer, BitRead, BitReadSized, BitStream, LittleEndian};
+use bitstream_reader::{BitBuffer, BitStream, LittleEndian};
 use num_traits::{PrimInt, Unsigned};
 use snap::Decoder;
 
-use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
 use crate::demo::packet::stringtable::{
     ExtraData, FixedUserdataSize, StringTable, StringTableEntry,
 };
+use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
 
 #[derive(Debug)]
 pub struct CreateStringTableMessage {
@@ -30,7 +28,7 @@ impl From<&StringTable> for StringTableMeta {
 }
 
 impl Parse for CreateStringTableMessage {
-    fn parse(stream: &mut Stream, state: &ParserState) -> Result<Self> {
+    fn parse(stream: &mut Stream, _state: &ParserState) -> Result<Self> {
         let name = stream.read()?;
         let max_entries: u16 = stream.read()?;
         let encode_bits = log_base2(max_entries);
@@ -106,11 +104,7 @@ impl Parse for UpdateStringTableMessage {
         let mut data = stream.read_bits(len)?;
 
         let entries = match state.string_tables.get(table_id as usize) {
-            Some(table) => parse_string_table_update(
-                &mut data,
-                table,
-                changed,
-            ),
+            Some(table) => parse_string_table_update(&mut data, table, changed),
             None => return Err(ParseError::StringTableNotFound(table_id)),
         }?;
 
@@ -129,7 +123,7 @@ fn parse_string_table_update(
     let mut last_entry: i16 = -1;
     let mut history: Vec<Option<String>> = Vec::new();
 
-    for i in 0..entry_count {
+    for _ in 0..entry_count {
         let index = if stream.read()? {
             (last_entry + 1) as u16
         } else {
@@ -138,11 +132,7 @@ fn parse_string_table_update(
 
         last_entry = index as i16;
 
-        let entry = read_table_entry(
-            stream,
-            table_meta,
-            &history
-        )?;
+        let entry = read_table_entry(stream, table_meta, &history)?;
         // optimize: any way to get rid of the clone here?
         // `entries` always outlives `history` without reallocation
         let text = entry.text.clone();
@@ -163,12 +153,11 @@ fn parse_string_table_list(
     table_meta: &StringTableMeta,
     entry_count: u16,
 ) -> ReadResult<Vec<StringTableEntry>> {
-    let entry_bits = log_base2(table_meta.max_entries);
     let mut entries = Vec::with_capacity(entry_count as usize);
 
     let mut history: Vec<Option<String>> = Vec::new();
 
-    for i in 0..entry_count {
+    for _ in 0..entry_count {
         if !stream.read::<bool>()? {
             panic!("there should be no holes when reading CreateStringTable message");
         };
@@ -229,12 +218,9 @@ fn read_table_entry(
     } else {
         None
     }
-        .map(ExtraData::new);
+    .map(ExtraData::new);
 
-    Ok(StringTableEntry {
-        text,
-        extra_data,
-    })
+    Ok(StringTableEntry { text, extra_data })
 }
 
 pub fn read_var_int(stream: &mut Stream) -> ReadResult<u32> {

src/demo/message/tempentities.rs

@@ -1,6 +1,4 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
-
-use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
+use crate::{Parse, ParserState, Result, Stream};
 
 use super::packetentities::PacketEntity;
 use super::stringtable::read_var_int;
@@ -11,10 +9,10 @@ pub struct TempEntitiesMessage {
 }
 
 impl Parse for TempEntitiesMessage {
-    fn parse(stream: &mut Stream, state: &ParserState) -> Result<Self> {
-        let count: u8 = stream.read()?;
+    fn parse(stream: &mut Stream, _state: &ParserState) -> Result<Self> {
+        let _count: u8 = stream.read()?;
         let length = read_var_int(stream)?;
-        let data = stream.read_bits(length as usize)?;
+        let _data = stream.read_bits(length as usize)?;
 
         Ok(TempEntitiesMessage {
             entities: Vec::new(),

src/demo/message/usermessage.rs

@@ -1,9 +1,8 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitstream_reader::{BitRead, LittleEndian};
 use enum_primitive_derive::Primitive;
-use num_traits::{FromPrimitive, ToPrimitive};
+use num_traits::FromPrimitive;
 use serde::Serialize;
 
-use crate::demo::message::usermessage::UserMessage::SayText2;
 use crate::{ReadResult, Stream};
 
 #[derive(Primitive, Clone, Copy, Debug)]

src/demo/message/voice.rs

@@ -1,6 +1,6 @@
-use bitstream_reader::{BitRead, BitStream, LittleEndian};
+use bitstream_reader::{BitRead, LittleEndian};
 
-use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
+use crate::{ReadResult, Stream};
 
 #[derive(Debug, Clone)]
 pub struct VoiceInitMessage {