1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-04 10:34:11 +02:00

minor cleanup

This commit is contained in:
Robin Appelman 2019-08-12 13:44:48 +02:00
commit 65d55c9a26
5 changed files with 24 additions and 27 deletions

View file

@ -9,7 +9,7 @@ use crate::demo::gamevent::{
RawGameEvent,
};
use crate::demo::parser::ParseBitSkip;
use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
use crate::{GameEventError, Parse, ParseError, ParserState, ReadResult, Result, Stream};
fn read_event_value(stream: &mut Stream, definition: &GameEventEntry) -> Result<GameEventValue> {
Ok(match definition.kind {
@ -20,7 +20,9 @@ fn read_event_value(stream: &mut Stream, definition: &GameEventEntry) -> Result<
GameEventValueType::Byte => GameEventValue::Byte(stream.read()?),
GameEventValueType::Boolean => GameEventValue::Boolean(stream.read()?),
GameEventValueType::Local => GameEventValue::Local,
GameEventValueType::None => unreachable!(),
GameEventValueType::None => {
return Err(ParseError::MalformedGameEvent(GameEventError::NoneValue))
}
})
}
@ -46,7 +48,7 @@ impl Parse for GameEventMessage {
values,
}
}
None => unreachable!(),
None => return Err(ParseError::MalformedGameEvent(GameEventError::UnknownType)),
};
let event = GameEvent::from_raw_event(raw_event)?;
Ok(GameEventMessage { event })