Simplify heap writing

This is because it's slowly turning into a general byte heap, for
deferred writing. I haven't checked yet, but most likely they do not
throw everything (ob ref lists, strings, etc) into one giant heap but
do it in a specific order.

src/layer/mod.rs

@@ -86,7 +86,7 @@ pub struct HeapString {
 #[derive(Debug)]
 pub struct StringHeap {
     pub pos: u64,
-    pub strings: Vec<HeapString>,
+    pub bytes: Vec<u8>,
     pub free_pos: u64,
 }
 
@@ -94,15 +94,11 @@ impl StringHeap {
     pub fn from(pos: u64) -> Self {
         Self {
             pos,
-            strings: Vec::new(),
+            bytes: Vec::new(),
             free_pos: 0, // unused, so it doesn't matter
         }
     }
 
-    pub fn add_string(&mut self, string: &HeapString) {
-        self.strings.push(string.clone());
-    }
-
     pub fn get_free_offset<T>(&mut self, obj: &T) -> i32
     where
         T: for<'a> BinWrite<Args<'a> = ()> + std::fmt::Debug,
@@ -114,6 +110,8 @@ impl StringHeap {
             obj.write_le(&mut cursor).unwrap();
         }
 
+        self.bytes.append(&mut buffer);
+
         let old_pos = self.free_pos;
         self.free_pos += buffer.len() as u64;
 
@@ -158,10 +156,7 @@ impl BinWrite for StringHeap {
         endian: Endian,
         (): Self::Args<'_>,
     ) -> Result<(), Error> {
-        for string in &self.strings {
+        self.bytes.write_options(writer, endian, ())?;
-            let bytes = write_string(&string.value);
-            bytes.write_options(writer, endian, ())?;
-        }
 
         Ok(())
     }
@@ -707,15 +702,12 @@ impl LayerGroup {
 
                 let mut heap = StringHeap {
                     pos: layer_offset as u64,
-                    strings: Vec::new(),
+                    bytes: Vec::new(),
                     free_pos: layer_offset as u64,
                 };
 
                 layer.header.write_le_args(&mut cursor, (&mut heap,)).ok()?;
 
-                // TODO: maybe do this in the binrw definition?
-                heap.add_string(&layer.header.name);
-
                 // write the heap
                 heap.write_le(&mut cursor).ok()?;
             }