more efficent rope serialization

vercel · Sep 4, 2024 · 2072188 · 2072188
1 parent f3fff62
commit 2072188
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/turbopack/crates/turbo-tasks-fs/Cargo.toml b/turbopack/crates/turbo-tasks-fs/Cargo.toml
@@ -40,6 +40,7 @@ mime = { workspace = true }
 notify = { workspace = true }
 parking_lot = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
+serde_bytes = { workspace = true }
 serde_json = { workspace = true }
 serde_path_to_error = { workspace = true }
 tokio = { workspace = true }

diff --git a/turbopack/crates/turbo-tasks-fs/src/rope.rs b/turbopack/crates/turbo-tasks-fs/src/rope.rs
@@ -14,6 +14,7 @@ use anyhow::{Context, Result};
 use bytes::{Buf, Bytes};
 use futures::Stream;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_bytes::ByteBuf;
 use tokio::io::{AsyncRead, ReadBuf};
 use turbo_tasks_hash::{DeterministicHash, DeterministicHasher};
 use RopeElem::{Local, Shared};
@@ -343,14 +344,17 @@ impl Serialize for Rope {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         use serde::ser::Error;
         let bytes = self.to_bytes().map_err(Error::custom)?;
-        bytes.serialize(serializer)
+        match bytes {
+            Cow::Borrowed(b) => serde_bytes::Bytes::new(b).serialize(serializer),
+            Cow::Owned(b) => ByteBuf::from(b).serialize(serializer),
+        }
     }
 }
 
 impl<'de> Deserialize<'de> for Rope {
     /// Deserializes strings into a contiguous, immutable Rope.
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let bytes = <Vec<u8>>::deserialize(deserializer)?;
+        let bytes = ByteBuf::deserialize(deserializer)?.into_vec();
         Ok(Rope::from(bytes))
     }
 }