summaryrefslogtreecommitdiff
path: root/serde_v8
diff options
context:
space:
mode:
Diffstat (limited to 'serde_v8')
-rw-r--r--serde_v8/Cargo.toml1
-rw-r--r--serde_v8/benches/ser.rs4
-rw-r--r--serde_v8/magic/bytestring.rs80
-rw-r--r--serde_v8/magic/transl8.rs22
-rw-r--r--serde_v8/magic/u16string.rs48
-rw-r--r--serde_v8/tests/de.rs6
-rw-r--r--serde_v8/tests/magic.rs4
7 files changed, 38 insertions, 127 deletions
diff --git a/serde_v8/Cargo.toml b/serde_v8/Cargo.toml
index 10f39ddf7..54dded27c 100644
--- a/serde_v8/Cargo.toml
+++ b/serde_v8/Cargo.toml
@@ -13,6 +13,7 @@ description = "Rust to V8 serialization and deserialization"
path = "lib.rs"
[dependencies]
+derive_more = "0.99.17"
serde = { version = "1.0.130", features = ["derive"] }
serde_bytes = "0.11"
v8 = "0.41.0"
diff --git a/serde_v8/benches/ser.rs b/serde_v8/benches/ser.rs
index 3ba95fc2a..1bfc6fadc 100644
--- a/serde_v8/benches/ser.rs
+++ b/serde_v8/benches/ser.rs
@@ -90,7 +90,7 @@ fn ser_struct_v8_manual(b: &mut Bencher) {
fn ser_bstr_12_b(b: &mut Bencher) {
serdo(|scope| {
- let bstr = ByteString("hello world\n".to_owned().into_bytes());
+ let bstr = ByteString::from("hello world\n");
b.iter(|| {
let _ = serde_v8::to_v8(scope, &bstr).unwrap();
});
@@ -101,7 +101,7 @@ fn ser_bstr_1024_b(b: &mut Bencher) {
serdo(|scope| {
let mut s = "hello world\n".repeat(100);
s.truncate(1024);
- let bstr = ByteString(s.into_bytes());
+ let bstr = ByteString::from(s);
b.iter(|| {
let _ = serde_v8::to_v8(scope, &bstr).unwrap();
});
diff --git a/serde_v8/magic/bytestring.rs b/serde_v8/magic/bytestring.rs
index 43ac54b97..a4c664b29 100644
--- a/serde_v8/magic/bytestring.rs
+++ b/serde_v8/magic/bytestring.rs
@@ -1,85 +1,11 @@
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
-
-use std::ops::{Deref, DerefMut};
-
use super::transl8::{FromV8, ToV8};
-use crate::magic::transl8::impl_magic;
+use crate::magic::transl8::{impl_magic, impl_wrapper};
use crate::Error;
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub struct ByteString(pub Vec<u8>);
+impl_wrapper! { pub struct ByteString(Vec<u8>); }
impl_magic!(ByteString);
-impl ByteString {
- pub fn new() -> ByteString {
- ByteString(Vec::new())
- }
-
- pub fn with_capacity(capacity: usize) -> ByteString {
- ByteString(Vec::with_capacity(capacity))
- }
-
- pub fn capacity(&self) -> usize {
- self.0.capacity()
- }
-
- pub fn reserve(&mut self, additional: usize) {
- self.0.reserve(additional)
- }
-
- pub fn reserve_exact(&mut self, additional: usize) {
- self.0.reserve_exact(additional)
- }
-
- pub fn shrink_to_fit(&mut self) {
- self.0.shrink_to_fit()
- }
-
- pub fn truncate(&mut self, len: usize) {
- self.0.truncate(len)
- }
-
- pub fn push(&mut self, value: u8) {
- self.0.push(value)
- }
-
- pub fn pop(&mut self) -> Option<u8> {
- self.0.pop()
- }
-}
-
-impl Default for ByteString {
- fn default() -> Self {
- ByteString::new()
- }
-}
-
-impl Deref for ByteString {
- type Target = [u8];
-
- fn deref(&self) -> &[u8] {
- self.0.deref()
- }
-}
-
-impl DerefMut for ByteString {
- fn deref_mut(&mut self) -> &mut [u8] {
- self.0.deref_mut()
- }
-}
-
-impl AsRef<[u8]> for ByteString {
- fn as_ref(&self) -> &[u8] {
- self.0.as_ref()
- }
-}
-
-impl AsMut<[u8]> for ByteString {
- fn as_mut(&mut self) -> &mut [u8] {
- self.0.as_mut()
- }
-}
-
impl ToV8 for ByteString {
fn to_v8<'a>(
&self,
@@ -117,6 +43,6 @@ impl FromV8 for ByteString {
);
assert!(written == len);
}
- Ok(ByteString(buffer))
+ Ok(buffer.into())
}
}
diff --git a/serde_v8/magic/transl8.rs b/serde_v8/magic/transl8.rs
index 458b82129..d08be468b 100644
--- a/serde_v8/magic/transl8.rs
+++ b/serde_v8/magic/transl8.rs
@@ -141,3 +141,25 @@ macro_rules! impl_magic {
};
}
pub(crate) use impl_magic;
+
+macro_rules! impl_wrapper {
+ ($i:item) => {
+ #[derive(
+ PartialEq,
+ Eq,
+ Clone,
+ Debug,
+ Default,
+ derive_more::Deref,
+ derive_more::DerefMut,
+ derive_more::AsRef,
+ derive_more::AsMut,
+ derive_more::From,
+ )]
+ #[as_mut(forward)]
+ #[as_ref(forward)]
+ #[from(forward)]
+ $i
+ };
+}
+pub(crate) use impl_wrapper;
diff --git a/serde_v8/magic/u16string.rs b/serde_v8/magic/u16string.rs
index 39ebf88d9..c1d080ac7 100644
--- a/serde_v8/magic/u16string.rs
+++ b/serde_v8/magic/u16string.rs
@@ -1,49 +1,11 @@
-use crate::magic::transl8::impl_magic;
+use super::transl8::{impl_magic, impl_wrapper, FromV8, ToV8};
use crate::Error;
-use std::ops::{Deref, DerefMut};
-use super::transl8::{FromV8, ToV8};
-
-#[derive(Default, PartialEq, Eq, Debug)]
-pub struct U16String(pub Vec<u16>);
+impl_wrapper!(
+ pub struct U16String(Vec<u16>);
+);
impl_magic!(U16String);
-impl U16String {
- pub fn with_zeroes(length: usize) -> U16String {
- U16String(vec![0u16; length])
- }
-
- pub fn truncate(&mut self, new_length: usize) {
- self.0.truncate(new_length);
- self.0.shrink_to_fit()
- }
-}
-
-impl Deref for U16String {
- type Target = [u16];
- fn deref(&self) -> &[u16] {
- self.0.deref()
- }
-}
-
-impl DerefMut for U16String {
- fn deref_mut(&mut self) -> &mut [u16] {
- self.0.deref_mut()
- }
-}
-
-impl AsRef<[u16]> for U16String {
- fn as_ref(&self) -> &[u16] {
- self.0.as_ref()
- }
-}
-
-impl AsMut<[u16]> for U16String {
- fn as_mut(&mut self) -> &mut [u16] {
- self.0.as_mut()
- }
-}
-
impl ToV8 for U16String {
fn to_v8<'a>(
&self,
@@ -78,6 +40,6 @@ impl FromV8 for U16String {
);
assert!(written == len);
}
- Ok(U16String(buffer))
+ Ok(buffer.into())
}
}
diff --git a/serde_v8/tests/de.rs b/serde_v8/tests/de.rs
index 0c784aced..37fc718a1 100644
--- a/serde_v8/tests/de.rs
+++ b/serde_v8/tests/de.rs
@@ -313,7 +313,7 @@ detest!(
}
);
-detest!(de_bstr, ByteString, "'hello'", ByteString("hello".into()));
+detest!(de_bstr, ByteString, "'hello'", "hello".into());
defail!(defail_bstr, ByteString, "'👋bye'", |e| e
== Err(Error::ExpectedLatin1));
@@ -321,11 +321,11 @@ detest!(
de_u16str,
U16String,
"'hello'",
- U16String("hello".encode_utf16().collect())
+ "hello".encode_utf16().collect::<Vec<_>>().into()
);
detest!(
de_u16str_non_latin1,
U16String,
"'👋bye'",
- U16String("👋bye".encode_utf16().collect())
+ "👋bye".encode_utf16().collect::<Vec<_>>().into()
);
diff --git a/serde_v8/tests/magic.rs b/serde_v8/tests/magic.rs
index 02fa41a68..c65c36b60 100644
--- a/serde_v8/tests/magic.rs
+++ b/serde_v8/tests/magic.rs
@@ -145,7 +145,7 @@ fn magic_byte_string() {
let rust_reflex: serde_v8::ByteString =
serde_v8::from_v8(scope, v8_string).unwrap();
assert_eq!(
- rust_reflex.as_ref(),
+ rust_reflex.as_slice(),
b"test \0\t\n\r\x7F\x80\xE1\xFE\xC6\xF1"
);
@@ -164,7 +164,7 @@ fn magic_byte_string() {
// ByteString to JS string
let expected = "a\x00sf:~\x7Fá\u{009C}þ\u{008A}";
let buf: Vec<u8> = b"a\x00sf:~\x7F\xE1\x9C\xFE\x8A".as_ref().into();
- let zbuf = serde_v8::ByteString(buf);
+ let zbuf = serde_v8::ByteString::from(buf);
let v8_value = serde_v8::to_v8(scope, zbuf).unwrap();
let key = serde_v8::to_v8(scope, "actual").unwrap();
global.set(scope, key, v8_value);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:51:27 +0000