diff options
Diffstat (limited to 'serde_v8')
-rw-r--r-- | serde_v8/benches/de.rs | 7 | ||||
-rw-r--r-- | serde_v8/benches/ser.rs | 4 | ||||
-rw-r--r-- | serde_v8/de.rs | 22 | ||||
-rw-r--r-- | serde_v8/error.rs | 6 | ||||
-rw-r--r-- | serde_v8/lib.rs | 14 | ||||
-rw-r--r-- | serde_v8/magic/bytestring.rs | 3 | ||||
-rw-r--r-- | serde_v8/magic/string_or_buffer.rs | 3 | ||||
-rw-r--r-- | serde_v8/magic/u16string.rs | 5 | ||||
-rw-r--r-- | serde_v8/ser.rs | 17 | ||||
-rw-r--r-- | serde_v8/tests/de.rs | 9 | ||||
-rw-r--r-- | serde_v8/tests/magic.rs | 6 | ||||
-rw-r--r-- | serde_v8/tests/ser.rs | 3 |
12 files changed, 69 insertions, 30 deletions
diff --git a/serde_v8/benches/de.rs b/serde_v8/benches/de.rs index 306374043..9cd2da689 100644 --- a/serde_v8/benches/de.rs +++ b/serde_v8/benches/de.rs @@ -1,9 +1,12 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use bencher::{benchmark_group, benchmark_main, Bencher}; +use bencher::benchmark_group; +use bencher::benchmark_main; +use bencher::Bencher; use serde::Deserialize; -use serde_v8::utils::{js_exec, v8_do}; +use serde_v8::utils::js_exec; +use serde_v8::utils::v8_do; use serde_v8::ByteString; #[derive(Debug, Deserialize, PartialEq)] diff --git a/serde_v8/benches/ser.rs b/serde_v8/benches/ser.rs index 37951c7f0..83274fae3 100644 --- a/serde_v8/benches/ser.rs +++ b/serde_v8/benches/ser.rs @@ -1,5 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use bencher::{benchmark_group, benchmark_main, Bencher}; +use bencher::benchmark_group; +use bencher::benchmark_main; +use bencher::Bencher; use serde::Serialize; diff --git a/serde_v8/de.rs b/serde_v8/de.rs index c3bea36a4..15a90a13d 100644 --- a/serde_v8/de.rs +++ b/serde_v8/de.rs @@ -1,15 +1,23 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use serde::de::{self, SeqAccess as _, Visitor}; +use serde::de::SeqAccess as _; +use serde::de::Visitor; +use serde::de::{self}; use serde::Deserialize; -use crate::error::{Error, Result}; -use crate::keys::{v8_struct_key, KeyCache}; +use crate::error::Error; +use crate::error::Result; +use crate::keys::v8_struct_key; +use crate::keys::KeyCache; +use crate::magic; +use crate::magic::transl8::visit_magic; use crate::magic::transl8::FromV8; -use crate::magic::transl8::{visit_magic, MagicType}; +use crate::magic::transl8::MagicType; use crate::payload::ValueType; -use crate::{ - magic, ByteString, DetachedBuffer, StringOrBuffer, U16String, ZeroCopyBuf, -}; +use crate::ByteString; +use crate::DetachedBuffer; +use crate::StringOrBuffer; +use crate::U16String; +use crate::ZeroCopyBuf; pub struct Deserializer<'a, 'b, 's> { input: v8::Local<'a, v8::Value>, diff --git a/serde_v8/error.rs b/serde_v8/error.rs index 38a67489f..fd763bb1e 100644 --- a/serde_v8/error.rs +++ b/serde_v8/error.rs @@ -1,7 +1,9 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use std::fmt::{self, Display}; +use std::fmt::Display; +use std::fmt::{self}; -use serde::{de, ser}; +use serde::de; +use serde::ser; pub type Result<T> = std::result::Result<T, Error>; diff --git a/serde_v8/lib.rs b/serde_v8/lib.rs index e2ec1015d..c15ca715a 100644 --- a/serde_v8/lib.rs +++ b/serde_v8/lib.rs @@ -8,8 +8,12 @@ mod ser; mod serializable; pub mod utils; -pub use de::{from_v8, from_v8_cached, to_utf8, Deserializer}; -pub use error::{Error, Result}; +pub use de::from_v8; +pub use de::from_v8_cached; +pub use de::to_utf8; +pub use de::Deserializer; +pub use error::Error; +pub use error::Result; pub use keys::KeyCache; pub use magic::buffer::ZeroCopyBuf; pub use magic::bytestring::ByteString; @@ -18,5 +22,7 @@ pub use magic::string_or_buffer::StringOrBuffer; pub use magic::u16string::U16String; pub use magic::Global; pub use magic::Value; -pub use ser::{to_v8, Serializer}; -pub use serializable::{Serializable, SerializablePkg}; +pub use ser::to_v8; +pub use ser::Serializer; +pub use serializable::Serializable; +pub use serializable::SerializablePkg; diff --git a/serde_v8/magic/bytestring.rs b/serde_v8/magic/bytestring.rs index 92a0dba40..77771698f 100644 --- a/serde_v8/magic/bytestring.rs +++ b/serde_v8/magic/bytestring.rs @@ -1,5 +1,6 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use super::transl8::{FromV8, ToV8}; +use super::transl8::FromV8; +use super::transl8::ToV8; use crate::magic::transl8::impl_magic; use crate::Error; use smallvec::SmallVec; diff --git a/serde_v8/magic/string_or_buffer.rs b/serde_v8/magic/string_or_buffer.rs index e3347255e..b7f6724b8 100644 --- a/serde_v8/magic/string_or_buffer.rs +++ b/serde_v8/magic/string_or_buffer.rs @@ -1,6 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use super::buffer::ZeroCopyBuf; -use super::transl8::{FromV8, ToV8}; +use super::transl8::FromV8; +use super::transl8::ToV8; use crate::magic::transl8::impl_magic; use crate::Error; use std::ops::Deref; diff --git a/serde_v8/magic/u16string.rs b/serde_v8/magic/u16string.rs index 11554738a..57e3fd0f6 100644 --- a/serde_v8/magic/u16string.rs +++ b/serde_v8/magic/u16string.rs @@ -2,7 +2,10 @@ use crate::Error; -use super::transl8::{impl_magic, impl_wrapper, FromV8, ToV8}; +use super::transl8::impl_magic; +use super::transl8::impl_wrapper; +use super::transl8::FromV8; +use super::transl8::ToV8; impl_wrapper!( pub struct U16String(Vec<u16>); diff --git a/serde_v8/ser.rs b/serde_v8/ser.rs index 67b0d6f68..834efa78a 100644 --- a/serde_v8/ser.rs +++ b/serde_v8/ser.rs @@ -5,13 +5,20 @@ use serde::ser::Serialize; use std::cell::RefCell; use std::ops::DerefMut; -use crate::error::{Error, Result}; +use crate::error::Error; +use crate::error::Result; use crate::keys::v8_struct_key; +use crate::magic; +use crate::magic::transl8::opaque_deref_mut; +use crate::magic::transl8::opaque_recv; +use crate::magic::transl8::MagicType; +use crate::magic::transl8::ToV8; use crate::magic::transl8::MAGIC_FIELD; -use crate::magic::transl8::{opaque_deref_mut, opaque_recv, MagicType, ToV8}; -use crate::{ - magic, ByteString, DetachedBuffer, StringOrBuffer, U16String, ZeroCopyBuf, -}; +use crate::ByteString; +use crate::DetachedBuffer; +use crate::StringOrBuffer; +use crate::U16String; +use crate::ZeroCopyBuf; type JsValue<'s> = v8::Local<'s, v8::Value>; type JsResult<'s> = Result<JsValue<'s>>; diff --git a/serde_v8/tests/de.rs b/serde_v8/tests/de.rs index c492a6018..b487b394e 100644 --- a/serde_v8/tests/de.rs +++ b/serde_v8/tests/de.rs @@ -1,10 +1,13 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use serde::{Deserialize, Deserializer}; +use serde::Deserialize; +use serde::Deserializer; -use serde_v8::utils::{js_exec, v8_do}; +use serde_v8::utils::js_exec; +use serde_v8::utils::v8_do; use serde_v8::ByteString; use serde_v8::Error; -use serde_v8::{U16String, ZeroCopyBuf}; +use serde_v8::U16String; +use serde_v8::ZeroCopyBuf; #[derive(Debug, Deserialize, PartialEq)] struct MathOp { diff --git a/serde_v8/tests/magic.rs b/serde_v8/tests/magic.rs index 54adc6c83..8ae163784 100644 --- a/serde_v8/tests/magic.rs +++ b/serde_v8/tests/magic.rs @@ -1,7 +1,9 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -use serde::{Deserialize, Serialize}; +use serde::Deserialize; +use serde::Serialize; -use serde_v8::utils::{js_exec, v8_do}; +use serde_v8::utils::js_exec; +use serde_v8::utils::v8_do; use serde_v8::Result; #[derive(Deserialize)] diff --git a/serde_v8/tests/ser.rs b/serde_v8/tests/ser.rs index 9e6c7c2e7..485a3ad6f 100644 --- a/serde_v8/tests/ser.rs +++ b/serde_v8/tests/ser.rs @@ -1,7 +1,8 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use serde::Serialize; use serde_json::json; -use serde_v8::utils::{js_exec, v8_do}; +use serde_v8::utils::js_exec; +use serde_v8::utils::v8_do; #[derive(Debug, Serialize, PartialEq)] struct MathOp { |