mirror of
https://codeberg.org/demostf/parser.git
synced 2026-06-03 18:24:05 +02:00
clippy fixes
This commit is contained in:
parent
490b4a03ab
commit
a7a8318083
3 changed files with 26 additions and 30 deletions
|
|
@ -231,9 +231,9 @@ fn test_bit_var_roundtrip() {
|
||||||
bit_var_normal(u32::MAX);
|
bit_var_normal(u32::MAX);
|
||||||
|
|
||||||
for i in 0..31 {
|
for i in 0..31 {
|
||||||
bit_var_normal(2u32.pow(i) as u32);
|
bit_var_normal(2u32.pow(i));
|
||||||
bit_var_normal(2u32.pow(i) as u32 - 1);
|
bit_var_normal(2u32.pow(i) - 1);
|
||||||
bit_var_normal(2u32.pow(i) as u32 + 1);
|
bit_var_normal(2u32.pow(i) + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,21 +88,17 @@ impl MessageHandler for EntityDumper {
|
||||||
type Output = Vec<EntityDump>;
|
type Output = Vec<EntityDump>;
|
||||||
|
|
||||||
fn does_handle(message_type: MessageType) -> bool {
|
fn does_handle(message_type: MessageType) -> bool {
|
||||||
match message_type {
|
matches!(message_type, MessageType::PacketEntities)
|
||||||
MessageType::PacketEntities => true,
|
|
||||||
_ => false,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_message(&mut self, message: &Message, tick: DemoTick, _parser_state: &ParserState) {
|
fn handle_message(&mut self, message: &Message, tick: DemoTick, _parser_state: &ParserState) {
|
||||||
match message {
|
if let Message::PacketEntities(entity_message) = message {
|
||||||
Message::PacketEntities(entity_message) => self.entities.extend(
|
self.entities.extend(
|
||||||
entity_message
|
entity_message
|
||||||
.entities
|
.entities
|
||||||
.iter()
|
.iter()
|
||||||
.map(|entity| (tick, entity.clone())),
|
.map(|entity| (tick, entity.clone())),
|
||||||
),
|
)
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,25 @@ use tf_demo_parser::demo::packet::Packet;
|
||||||
use tf_demo_parser::demo::parser::{DemoHandler, Encode, NullHandler};
|
use tf_demo_parser::demo::parser::{DemoHandler, Encode, NullHandler};
|
||||||
use tf_demo_parser::{MessageType, Parse};
|
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("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.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")]
|
#[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);
|
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());
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue