demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-04 02:24:12 +02:00
Code Issues Releases Wiki Activity

clippy fixes

Browse source
This commit is contained in:
Robin Appelman 2021-07-17 15:37:15 +02:00
commit 5573ec5db2
8 changed files with 42 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/demo/message/gameevent.rs
View file

@ -10,7 +10,7 @@ use crate::{GameEventError, Parse, ParseError, ParserState, ReadResult, Result,
#[derive(Debug)]
pub struct GameEventMessage {
pub event: Box<GameEvent>,
pub event: GameEvent,
}
impl Parse<'_> for GameEventMessage {
@ -20,12 +20,12 @@ impl Parse<'_> for GameEventMessage {
let event_type: GameEventTypeId = data.read()?;
// game event definitions haven't been sent yet, ignore
if state.event_definitions.len() == 0 {
if state.event_definitions.is_empty() {
return Ok(GameEventMessage {
event: Box::new(GameEvent::Unknown(RawGameEvent {
event: GameEvent::Unknown(RawGameEvent {
event_type: GameEventType::Unknown,
values: Vec::new(),
})),
}),
});
}
@ -37,9 +37,7 @@ impl Parse<'_> for GameEventMessage {
)));
}
};
Ok(GameEventMessage {
event: Box::new(event),
})
Ok(GameEventMessage { event })
}
}

8
src/demo/message/packetentities.rs
View file

@ -115,11 +115,11 @@ pub struct PacketEntitiesMessage {
pub updated_base_line: bool,
}
fn get_send_table<'a, 'b>(state: &'b ParserState, class: ClassId) -> Result<&'b SendTable> {
fn get_send_table(state: &ParserState, class: ClassId) -> Result<&SendTable> {
state
.send_tables
.get(usize::from(class))
.ok_or_else(|| ParseError::UnknownServerClass(class))
.ok_or(ParseError::UnknownServerClass(class))
}
fn get_entity_for_update(
@ -130,7 +130,7 @@ fn get_entity_for_update(
let class_id = *state
.entity_classes
.get(&entity_index)
.ok_or_else(|| ParseError::UnknownEntity(entity_index))?;
.ok_or(ParseError::UnknownEntity(entity_index))?;
Ok(PacketEntity {
server_class: class_id,
@ -215,7 +215,7 @@ impl PacketEntitiesMessage {
let send_table = state
.send_tables
.get(usize::from(class_index))
.ok_or_else(|| ParseError::UnknownServerClass(class_index))?;
.ok_or(ParseError::UnknownServerClass(class_index))?;
let props = match state.instance_baselines[baseline_index].get(&entity_index) {
Some(baseline) => baseline.clone(),

4
src/demo/message/stringtable.rs
View file

@ -48,7 +48,7 @@ impl<'a> Parse<'a> for CreateStringTableMessage<'a> {
let decompressed_size: u32 = table_data.read()?;
let compressed_size: u32 = table_data.read()?;
if compressed_size < 4 || compressed_size > 10 * 1024 * 1024 {
if !(4..=10 * 1024 * 1024).contains(&compressed_size) {
return Err(ParseError::InvalidDemo(
"Invalid compressed string table size",
));
@ -145,7 +145,7 @@ impl<'a> Parse<'a> for UpdateStringTableMessage<'a> {
None => return Err(ParseError::StringTableNotFound(table_id)),
}?;
Ok(UpdateStringTableMessage { table_id, entries })
Ok(UpdateStringTableMessage { entries, table_id })
}
}