From 12f7581ed9ee5324a425074d30aedd38b89d4838 Mon Sep 17 00:00:00 2001
From: Aaron O'Mullan <aaron.omullan@gmail.com>
Date: Mon, 25 Apr 2022 09:56:47 -0500
Subject: cleanup(serde_v8): disambiguate ZeroCopyBuf (#14380)

---
 serde_v8/tests/de.rs    |  8 ++++----
 serde_v8/tests/magic.rs | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'serde_v8/tests')

diff --git a/serde_v8/tests/de.rs b/serde_v8/tests/de.rs
index 6eea680c6..d08f98d67 100644
--- a/serde_v8/tests/de.rs
+++ b/serde_v8/tests/de.rs
@@ -4,7 +4,7 @@ use serde::Deserialize;
 use serde_v8::utils::{js_exec, v8_do};
 use serde_v8::ByteString;
 use serde_v8::Error;
-use serde_v8::{Buffer, U16String};
+use serde_v8::{U16String, ZeroCopyBuf};
 
 #[derive(Debug, Deserialize, PartialEq)]
 struct MathOp {
@@ -204,20 +204,20 @@ fn de_string_or_buffer() {
 fn de_buffers() {
   // ArrayBufferView
   dedo("new Uint8Array([97])", |scope, v| {
-    let buf: Buffer = serde_v8::from_v8(scope, v).unwrap();
+    let buf: ZeroCopyBuf = serde_v8::from_v8(scope, v).unwrap();
     assert_eq!(&*buf, &[97]);
   });
 
   // ArrayBuffer
   dedo("(new Uint8Array([97])).buffer", |scope, v| {
-    let buf: Buffer = serde_v8::from_v8(scope, v).unwrap();
+    let buf: ZeroCopyBuf = serde_v8::from_v8(scope, v).unwrap();
     assert_eq!(&*buf, &[97]);
   });
 
   dedo(
     "(Uint8Array.from([0x68, 0x65, 0x6C, 0x6C, 0x6F]))",
     |scope, v| {
-      let buf: Buffer = serde_v8::from_v8(scope, v).unwrap();
+      let buf: ZeroCopyBuf = serde_v8::from_v8(scope, v).unwrap();
       assert_eq!(&*buf, &[0x68, 0x65, 0x6C, 0x6C, 0x6F]);
     },
   );
diff --git a/serde_v8/tests/magic.rs b/serde_v8/tests/magic.rs
index c65c36b60..6d60efd66 100644
--- a/serde_v8/tests/magic.rs
+++ b/serde_v8/tests/magic.rs
@@ -66,26 +66,27 @@ fn magic_buffer() {
 
     // Simple buffer
     let v8_array = js_exec(scope, "new Uint8Array([1,2,3,4,5])");
-    let zbuf: serde_v8::Buffer = serde_v8::from_v8(scope, v8_array).unwrap();
+    let zbuf: serde_v8::ZeroCopyBuf =
+      serde_v8::from_v8(scope, v8_array).unwrap();
     assert_eq!(&*zbuf, &[1, 2, 3, 4, 5]);
 
     // Multi buffers
     let v8_arrays =
       js_exec(scope, "[new Uint8Array([1,2]), new Uint8Array([3,4,5])]");
-    let (z1, z2): (serde_v8::Buffer, serde_v8::Buffer) =
+    let (z1, z2): (serde_v8::ZeroCopyBuf, serde_v8::ZeroCopyBuf) =
       serde_v8::from_v8(scope, v8_arrays).unwrap();
     assert_eq!(&*z1, &[1, 2]);
     assert_eq!(&*z2, &[3, 4, 5]);
 
     // Wrapped in option, like our current op-ABI
     let v8_array = js_exec(scope, "new Uint8Array([1,2,3,4,5])");
-    let zbuf: Option<serde_v8::Buffer> =
+    let zbuf: Option<serde_v8::ZeroCopyBuf> =
       serde_v8::from_v8(scope, v8_array).unwrap();
     assert_eq!(&*zbuf.unwrap(), &[1, 2, 3, 4, 5]);
 
     // Observe mutation in JS
     let v8_array = js_exec(scope, "new Uint8Array([1,2,3,4,5])");
-    let mut zbuf: serde_v8::Buffer =
+    let mut zbuf: serde_v8::ZeroCopyBuf =
       serde_v8::from_v8(scope, v8_array).unwrap();
     let key = serde_v8::to_v8(scope, "t1").unwrap();
     global.set(scope, key, v8_array);
@@ -96,12 +97,13 @@ fn magic_buffer() {
     // Shared buffers
     let v8_array =
       js_exec(scope, "new Uint8Array(new SharedArrayBuffer([1,2,3,4,5]))");
-    let zbuf: Result<serde_v8::Buffer> = serde_v8::from_v8(scope, v8_array);
+    let zbuf: Result<serde_v8::ZeroCopyBuf> =
+      serde_v8::from_v8(scope, v8_array);
     assert!(zbuf.is_err());
 
     // Serialization
     let buf: Vec<u8> = vec![1, 2, 3, 99, 5];
-    let zbuf: serde_v8::Buffer = buf.into();
+    let zbuf: serde_v8::ZeroCopyBuf = buf.into();
     let v8_value = serde_v8::to_v8(scope, zbuf).unwrap();
     let key = serde_v8::to_v8(scope, "t2").unwrap();
     global.set(scope, key, v8_value);
@@ -111,8 +113,8 @@ fn magic_buffer() {
     // Composite Serialization
     #[derive(serde::Serialize)]
     struct Wrapper {
-      a: serde_v8::Buffer,
-      b: serde_v8::Buffer,
+      a: serde_v8::ZeroCopyBuf,
+      b: serde_v8::ZeroCopyBuf,
     }
     let buf1: Vec<u8> = vec![1, 2, 33, 4, 5];
     let buf2: Vec<u8> = vec![5, 4, 3, 2, 11];
-- 
cgit v1.2.3