From ac66cd40314ff8b9c04beea11080211d62ff0508 Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Tue, 14 May 2024 02:43:07 +0000
Subject: [PATCH] slightly optimize lists of non-recursing non-primitives

---
 simdnbt/src/borrow/list.rs | 24 ++++++++++++------------
 simdnbt/src/borrow/mod.rs  |  6 ++++++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/simdnbt/src/borrow/list.rs b/simdnbt/src/borrow/list.rs
index 9279b46..788a916 100644
--- a/simdnbt/src/borrow/list.rs
+++ b/simdnbt/src/borrow/list.rs
@@ -58,33 +58,33 @@ impl<'a> NbtList<'a> {
             DOUBLE_ID => NbtList::Double(RawList::new(read_with_u32_length(data, 8)?)),
             BYTE_ARRAY_ID => NbtList::ByteArray({
                 let length = read_u32(data)?;
-                let mut tags = alloc.get().unnamed_bytearray.start(list_depth);
+                let mut tags = alloc.get().unnamed_bytearray.start(0);
                 for _ in 0..length {
                     let tag = match read_u8_array(data) {
                         Ok(tag) => tag,
                         Err(e) => {
-                            alloc.get().unnamed_bytearray.finish(tags, list_depth);
+                            alloc.get().unnamed_bytearray.finish(tags, 0);
                             return Err(e);
                         }
                     };
                     tags.push(tag);
                 }
-                alloc.get().unnamed_bytearray.finish(tags, list_depth)
+                alloc.get().unnamed_bytearray.finish(tags, 0)
             }),
             STRING_ID => NbtList::String({
                 let length = read_u32(data)?;
-                let mut tags = alloc.get().unnamed_string.start(list_depth);
+                let mut tags = alloc.get().unnamed_string.start(0);
                 for _ in 0..length {
                     let tag = match read_string(data) {
                         Ok(tag) => tag,
                         Err(e) => {
-                            alloc.get().unnamed_string.finish(tags, list_depth);
+                            alloc.get().unnamed_string.finish(tags, 0);
                             return Err(e);
                         }
                     };
                     tags.push(tag);
                 }
-                alloc.get().unnamed_string.finish(tags, list_depth)
+                alloc.get().unnamed_string.finish(tags, 0)
             }),
             LIST_ID => NbtList::List({
                 let length = read_u32(data)?;
@@ -123,33 +123,33 @@ impl<'a> NbtList<'a> {
             }),
             INT_ARRAY_ID => NbtList::IntArray({
                 let length = read_u32(data)?;
-                let mut tags = alloc.get().unnamed_intarray.start(list_depth);
+                let mut tags = alloc.get().unnamed_intarray.start(0);
                 for _ in 0..length {
                     let tag = match read_int_array(data) {
                         Ok(tag) => tag,
                         Err(e) => {
-                            alloc.get().unnamed_intarray.finish(tags, list_depth);
+                            alloc.get().unnamed_intarray.finish(tags, 0);
                             return Err(e);
                         }
                     };
                     tags.push(tag);
                 }
-                alloc.get().unnamed_intarray.finish(tags, list_depth)
+                alloc.get().unnamed_intarray.finish(tags, 0)
             }),
             LONG_ARRAY_ID => NbtList::LongArray({
                 let length = read_u32(data)?;
-                let mut tags = alloc.get().unnamed_longarray.start(list_depth);
+                let mut tags = alloc.get().unnamed_longarray.start(0);
                 for _ in 0..length {
                     let tag = match read_long_array(data) {
                         Ok(tag) => tag,
                         Err(e) => {
-                            alloc.get().unnamed_longarray.finish(tags, list_depth);
+                            alloc.get().unnamed_longarray.finish(tags, 0);
                             return Err(e);
                         }
                     };
                     tags.push(tag);
                 }
-                alloc.get().unnamed_longarray.finish(tags, list_depth)
+                alloc.get().unnamed_longarray.finish(tags, 0)
             }),
             _ => return Err(Error::UnknownTagId(tag_type)),
         })
diff --git a/simdnbt/src/borrow/mod.rs b/simdnbt/src/borrow/mod.rs
index f8c0a84..14dc238 100644
--- a/simdnbt/src/borrow/mod.rs
+++ b/simdnbt/src/borrow/mod.rs
@@ -359,6 +359,12 @@ mod tests {
         assert_eq!(nbt.list("Rotation").unwrap().floats().unwrap().len(), 2);
     }
 
+    #[test]
+    fn read_realworld() {
+        let src = include_bytes!("../../tests/realworld.nbt").to_vec();
+        let _nbt = Nbt::read(&mut Cursor::new(&src[..])).unwrap().unwrap();
+    }
+
     #[test]
     fn read_write_complex_player() {
         let src = include_bytes!("../../tests/complex_player.dat").to_vec();