Version v0.2.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marshal-rs"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["savannstm <[email protected]>"]
 edition = "2021"
 rust-version = "1.63.0"

src/dump.rs

@@ -267,6 +267,12 @@ impl<'a> Dumper<'a> {
 
         if object_length > 0 {
             for (key, value) in object.iter_mut() {
+                let mut key = key.to_owned();
+
+                if let Some(prefix) = self.instance_var_prefix {
+                    key.replace_range(10..10 + prefix.len(), "@");
+                }
+
                 let key_string: String =
                     key.replacen(self.instance_var_prefix.unwrap_or("@"), "@", 1);
 

src/load.rs

@@ -412,14 +412,13 @@ impl<'a> Loader<'a> {
                     let key: Value = unsafe { &*self.read_next().borrow().get() }.clone();
                     let value: Value = unsafe { &*self.read_next().borrow().get() }.clone();
 
-                    let key_str: &str = key.as_str().unwrap();
-                    rc.borrow_mut().get_mut()[key_str
-                        .replacen(
-                            "__symbol__@",
-                            self.instance_var_prefix.unwrap_or("__symbol__@"),
-                            1,
-                        )
-                        .as_str()] = value;
+                    let mut key_str: String = key.as_str().unwrap().to_string();
+
+                    if let Some(prefix) = self.instance_var_prefix {
+                        key_str.replace_range(10..11, prefix)
+                    }
+
+                    rc.borrow_mut().get_mut()[key_str] = value;
                 }
 
                 rc