message write

src/demo/message/gameevent.rs

@@ -204,9 +204,7 @@ impl BitWrite<LittleEndian> for GameEventListMessage {
                 event.write(stream)?;
             }
             Ok(())
-        })?;
-
-        Ok(())
+        })
     }
 }
 

src/demo/message/mod.rs

@@ -1,5 +1,4 @@
 use num_enum::TryFromPrimitive;
-use std::convert::TryFrom;
 
 pub use generated::*;
 
@@ -14,8 +13,9 @@ use crate::demo::message::stringtable::*;
 use crate::demo::message::tempentities::*;
 use crate::demo::message::usermessage::*;
 use crate::demo::message::voice::*;
-use crate::demo::parser::ParseBitSkip;
-use crate::{Parse, ParseError, ParserState, Result, Stream};
+use crate::demo::parser::{Encode, ParseBitSkip};
+use crate::{Parse, ParserState, Result, Stream};
+use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
 
 pub mod bspdecal;
 pub mod classinfo;
@@ -28,8 +28,20 @@ pub mod tempentities;
 pub mod usermessage;
 pub mod voice;
 
-#[derive(TryFromPrimitive, Debug, Clone, Copy, PartialEq, Eq, Serialize_repr, Deserialize_repr)]
+#[derive(
+    TryFromPrimitive,
+    BitRead,
+    BitWrite,
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    Serialize_repr,
+    Deserialize_repr,
+)]
 #[repr(u8)]
+#[discriminant_bits = 6]
 pub enum MessageType {
     Empty = 0,
     File = 2,
@@ -61,13 +73,6 @@ pub enum MessageType {
     CmdKeyValues = 32,
 }
 
-impl Parse<'_> for MessageType {
-    fn parse(stream: &mut Stream, _state: &ParserState) -> Result<Self> {
-        let raw = stream.read_int(6)?;
-        MessageType::try_from(raw).map_err(|_| ParseError::InvalidMessageType(raw))
-    }
-}
-
 #[derive(Debug)]
 pub enum Message<'a> {
     Empty,
@@ -233,3 +238,38 @@ impl<'a> Message<'a> {
         }
     }
 }
+
+impl Encode for Message<'_> {
+    fn encode(&self, stream: &mut BitWriteStream<LittleEndian>, state: &ParserState) -> Result<()> {
+        match self {
+            Message::Empty => Ok(()),
+            Message::File(message) => message.encode(stream, state),
+            Message::NetTick(message) => message.encode(stream, state),
+            Message::StringCmd(message) => message.encode(stream, state),
+            Message::SetConVar(message) => message.encode(stream, state),
+            Message::SigOnState(message) => message.encode(stream, state),
+            Message::Print(message) => message.encode(stream, state),
+            Message::ServerInfo(message) => message.encode(stream, state),
+            Message::ClassInfo(message) => message.encode(stream, state),
+            Message::SetPause(message) => message.encode(stream, state),
+            Message::CreateStringTable(message) => message.encode(stream, state),
+            Message::UpdateStringTable(message) => message.encode(stream, state),
+            Message::VoiceInit(message) => message.encode(stream, state),
+            Message::VoiceData(message) => message.encode(stream, state),
+            Message::ParseSounds(message) => message.encode(stream, state),
+            Message::SetView(message) => message.encode(stream, state),
+            Message::FixAngle(message) => message.encode(stream, state),
+            Message::BspDecal(message) => message.encode(stream, state),
+            Message::UserMessage(message) => message.encode(stream, state),
+            Message::EntityMessage(message) => message.encode(stream, state),
+            Message::GameEvent(message) => message.encode(stream, state),
+            Message::PacketEntities(message) => message.encode(stream, state),
+            Message::TempEntities(message) => message.encode(stream, state),
+            Message::PreFetch(message) => message.encode(stream, state),
+            Message::Menu(message) => message.encode(stream, state),
+            Message::GameEventList(message) => message.encode(stream, state),
+            Message::GetCvarValue(message) => message.encode(stream, state),
+            Message::CmdKeyValues(message) => message.encode(stream, state),
+        }
+    }
+}

src/demo/message/packetentities.rs

@@ -5,10 +5,7 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 use crate::demo::message::stringtable::log_base2;
 use crate::demo::packet::datatable::{ClassId, SendTable};
 use crate::demo::parser::{Encode, ParseBitSkip};
-use crate::demo::sendprop::{
-    FloatDefinition, SendProp, SendPropDefinition, SendPropIdentifier, SendPropParseDefinition,
-    SendPropValue,
-};
+use crate::demo::sendprop::{SendProp, SendPropIdentifier, SendPropValue};
 use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};
 use parse_display::{Display, FromStr};
 use std::cmp::min;
@@ -452,6 +449,7 @@ impl ParseBitSkip<'_> for PacketEntitiesMessage {
 #[test]
 fn test_packet_entitier_message_roundtrip() {
     use crate::demo::packet::datatable::{SendTable, SendTableName, ServerClass, ServerClassName};
+    use crate::demo::sendprop::{FloatDefinition, SendPropDefinition, SendPropParseDefinition};
 
     let mut state = ParserState::new(|_| false, false);
     state.server_classes = vec![