optimize

rnex-core/src/rmc/structures/string.rs

@@ -1,39 +1,49 @@
 use std::io::{Read, Write};
 use bytemuck::bytes_of;
 use log::error;
+use rocket::form::validate::Len;
 use v_byte_helpers::{IS_BIG_ENDIAN, ReadExtensions};
 use super::{Result, RmcSerialize};
 
 impl RmcSerialize for String{
-    fn deserialize(mut reader: &mut dyn Read) -> Result<Self> {
+    fn deserialize(mut reader: &mut impl Read) -> Result<Self> {
         let len: u16 = reader.read_struct(IS_BIG_ENDIAN)?;
-        let mut data = vec![0; len as usize - 1];
+        if len == 0{
+            return Ok("".to_string());
+        }
+        let mut data = vec![0; len as usize];
         reader.read_exact(&mut data)?;
-
-        let null: u8 = reader.read_struct(IS_BIG_ENDIAN)?;
-        if null != 0{
+        if *data.last().unwrap() != 0{
             error!("unable to find null terminator... continuing anyways");
         }
+        data.pop();
 
         Ok(String::from_utf8(data)?)
     }
-    fn serialize(&self, writer: &mut dyn Write) -> Result<()> {
+    fn serialize(&self, writer: &mut impl Write) -> Result<()> {
         (&self[..]).serialize(writer)
     }
+    fn serialize_write_size(&self) -> Result<u32> {
+        (&self[..]).serialize_write_size()
+    }
 }
 
 impl RmcSerialize for &str{
-    fn deserialize(_reader: &mut dyn Read) -> Result<Self> {
+    fn deserialize(_reader: &mut impl Read) -> Result<Self> {
         panic!("cannot serialize to &str")
     }
-    fn serialize(&self, writer: &mut dyn Write) -> Result<()> {
+    fn serialize(&self, writer: &mut impl Write) -> Result<()> {
         let u16_len: u16 = (self.len() + 1) as u16;
-        writer.write(bytes_of(&u16_len))?;
+        writer.write_all(bytes_of(&u16_len))?;
 
-        writer.write(self.as_bytes())?;
-        writer.write(&[0])?;
+        writer.write_all(self.as_bytes())?;
+        writer.write_all(&[0])?;
 
         Ok(())
     }
+    #[inline(always)]
+    fn serialize_write_size(&self) -> Result<u32> {
+        Ok(2 + self.as_bytes().len() as u32 + 1)
+    }
 }