Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test boxed vec #382

Merged
merged 3 commits into from
Aug 13, 2024
Merged

test boxed vec #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a401c13
test boxed vec
Licenser Aug 13, 2024
91744b3
Add owned value
Licenser Aug 13, 2024
0f0d439
Fix wasm
Licenser Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,11 @@ macro_rules! json_internal_owned {
};

([]) => {
$crate::value::owned::Value::Array(json_internal_vec![])
$crate::value::owned::Value::Array(Box::new(json_internal_vec![]))
};

([ $($tt:tt)+ ]) => {
$crate::value::owned::Value::Array(json_internal_owned!(@array [] $($tt)+))
$crate::value::owned::Value::Array(Box::new(json_internal_owned!(@array [] $($tt)+)))
};

({}) => {
Expand Down Expand Up @@ -657,11 +657,11 @@ macro_rules! json_internal_owned {
};

([]) => {
$crate::value::owned::Value::Array(json_internal_vec![])
$crate::value::owned::Value::Array(Box::new(json_internal_vec![]))
};

([ $($tt:tt)+ ]) => {
$crate::value::owned::Value::Array(json_internal_owned!(@array [] $($tt)+))
$crate::value::owned::Value::Array(Box::new(json_internal_owned!(@array [] $($tt)+)))
};

({}) => {
Expand Down Expand Up @@ -904,11 +904,11 @@ macro_rules! json_internal_borrowed {
};

([]) => {
$crate::value::borrowed::Value::Array(json_internal_vec![])
$crate::value::borrowed::Value::Array(Box::new(json_internal_vec![]))
};

([ $($tt:tt)+ ]) => {
$crate::value::borrowed::Value::Array(json_internal_borrowed!(@array [] $($tt)+))
$crate::value::borrowed::Value::Array(Box::new(json_internal_borrowed!(@array [] $($tt)+)))
};

({}) => {
Expand Down Expand Up @@ -1144,11 +1144,11 @@ macro_rules! json_internal_borrowed {
};

([]) => {
$crate::value::borrowed::Value::Array(json_internal_vec![])
$crate::value::borrowed::Value::Array(Box::new(json_internal_vec![]))
};

([ $($tt:tt)+ ]) => {
$crate::value::borrowed::Value::Array(json_internal_borrowed!(@array [] $($tt)+))
$crate::value::borrowed::Value::Array(Box::new(json_internal_borrowed!(@array [] $($tt)+)))
};

({}) => {
Expand Down
2 changes: 1 addition & 1 deletion src/serde/value/borrowed/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ impl<'de> Visitor<'de> for ValueVisitor {
while let Some(e) = seq.next_element()? {
v.push(e);
}
Ok(Value::Array(v))
Ok(Value::Array(Box::new(v)))
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/serde/value/borrowed/se.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl<'value> Serialize for Value<'value> {
Value::String(s) => serializer.serialize_str(s),
Value::Array(v) => {
let mut seq = serializer.serialize_seq(Some(v.len()))?;
for e in v {
for e in v.as_ref() {
seq.serialize_element(e)?;
}
seq.end()
Expand Down Expand Up @@ -298,7 +298,7 @@ impl<'se> serde::ser::SerializeSeq for SerializeVec<'se> {
}

fn end(self) -> Result<Value<'se>> {
Ok(Value::Array(self.vec))
Ok(Value::Array(Box::new(self.vec)))
}
}

Expand Down Expand Up @@ -348,7 +348,7 @@ impl<'se> serde::ser::SerializeTupleVariant for SerializeTupleVariant<'se> {

fn end(self) -> Result<Value<'se>> {
let mut object = Object::with_capacity_and_hasher(1, ObjectHasher::default());
object.insert_nocheck(self.name.into(), Value::Array(self.vec));
object.insert_nocheck(self.name.into(), Value::Array(Box::new(self.vec)));

Ok(Value::Object(Box::new(object)))
}
Expand Down Expand Up @@ -654,10 +654,10 @@ mod test {

#[test]
fn arr() {
let v = Value::Array(vec![
let v = Value::Array(Box::new(vec![
Value::Static(StaticNode::I64(42)),
Value::Static(StaticNode::I64(23)),
]);
]));
let s = serde_json::to_string(&v).expect("Failed to serialize");
assert_eq!(s, "[42,23]");
}
Expand Down
2 changes: 1 addition & 1 deletion src/serde/value/owned/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ impl<'de> Visitor<'de> for ValueVisitor {
while let Some(e) = seq.next_element()? {
v.push(e);
}
Ok(Value::Array(v))
Ok(Value::Array(Box::new(v)))
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/serde/value/owned/se.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl Serialize for Value {
Value::String(s) => serializer.serialize_str(s),
Value::Array(v) => {
let mut seq = serializer.serialize_seq(Some(v.len()))?;
for e in v {
for e in v.as_ref() {
seq.serialize_element(e)?;
}
seq.end()
Expand Down Expand Up @@ -284,7 +284,7 @@ impl serde::ser::SerializeSeq for SerializeVec {
}

fn end(self) -> Result<Value> {
Ok(Value::Array(self.vec))
Ok(Value::Array(Box::new(self.vec)))
}
}

Expand Down Expand Up @@ -334,7 +334,7 @@ impl serde::ser::SerializeTupleVariant for SerializeTupleVariant {

fn end(self) -> Result<Value> {
let mut object = Object::with_capacity_and_hasher(1, ObjectHasher::default());
object.insert_nocheck(self.name, Value::Array(self.vec));
object.insert_nocheck(self.name, Value::Array(Box::new(self.vec)));
Ok(Value::from(object))
}
}
Expand Down
26 changes: 13 additions & 13 deletions src/tests/serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ fn empty_array() {
let d = unsafe { d.as_bytes_mut() };
let v_serde: serde_json::Value = serde_json::from_slice(d).expect("parse_serde");
let v_simd: serde_json::Value = from_slice(d).expect("parse_simd");
assert_eq!(to_value(d1), Ok(Value::Array(vec![])));
assert_eq!(to_value(d1), Ok(Value::array()));
assert_eq!(v_simd, v_serde);
}

Expand Down Expand Up @@ -225,7 +225,7 @@ fn double_array() {
let d = unsafe { d.as_bytes_mut() };
let v_serde: serde_json::Value = serde_json::from_slice(d).expect("parse_serde");
let v_simd: serde_json::Value = from_slice(d).expect("parse_simd");
assert_eq!(to_value(d1), Ok(Value::Array(vec![Value::Array(vec![])])));
assert_eq!(to_value(d1), Ok(Value::from(vec![Value::array()])));
assert_eq!(v_simd, v_serde);
}

Expand All @@ -239,8 +239,8 @@ fn null_null_array() {
let v_simd: serde_json::Value = from_slice(d).expect("parse_simd");
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![
Value::Array(vec![]),
Ok(Value::from(vec![
Value::array(),
Value::Static(StaticNode::Null),
Value::Static(StaticNode::Null),
]))
Expand All @@ -254,7 +254,7 @@ fn one_element_array() {
let mut d1 = d.clone();
let d1 = unsafe { d1.as_bytes_mut() };
let d = unsafe { d.as_bytes_mut() };
assert_eq!(to_value(d1), Ok(Value::Array(vec![Value::from("snot")])));
assert_eq!(to_value(d1), Ok(Value::from(vec![Value::from("snot")])));
let v_serde: serde_json::Value = serde_json::from_slice(d).expect("");
let v_simd: serde_json::Value = from_slice(d).expect("");
assert_eq!(v_simd, v_serde);
Expand All @@ -268,7 +268,7 @@ fn two_element_array() {
let d = unsafe { d.as_bytes_mut() };
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![
Ok(Value::from(vec![
Value::from("snot"),
Value::from("badger")
]))
Expand All @@ -289,7 +289,7 @@ fn list() {
assert_eq!(v_simd, v_serde);
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![
Ok(Value::from(vec![
Value::from(42),
Value::from(23.0),
Value::from("snot badger")
Expand All @@ -305,9 +305,9 @@ fn nested_list1() {
let d = unsafe { d.as_bytes_mut() };
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![
Ok(Value::from(vec![
Value::from(42),
Value::Array(vec![Value::from(23.0), Value::from("snot")]),
Value::from(vec![Value::from(23.0), Value::from("snot")]),
Value::from("bad"),
Value::from("ger")
]))
Expand Down Expand Up @@ -366,7 +366,7 @@ fn odd_array() {
assert_eq!(v_simd, v_serde);
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![
Ok(Value::from(vec![
Value::from(Object::default()),
Value::Static(StaticNode::Null)
]))
Expand Down Expand Up @@ -420,7 +420,7 @@ fn null_null() {
let d = unsafe { d.as_bytes_mut() };
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![
Ok(Value::from(vec![
Value::Static(StaticNode::Null),
Value::Static(StaticNode::Null),
]))
Expand All @@ -438,7 +438,7 @@ fn nested_null() {
let d = unsafe { d.as_bytes_mut() };
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![Value::Array(vec![
Ok(Value::from(vec![Value::from(vec![
Value::Static(StaticNode::Null),
Value::Static(StaticNode::Null),
])]))
Expand All @@ -460,7 +460,7 @@ fn nestednested_null() {
assert_eq!(v_simd, v_serde);
assert_eq!(
to_value(d1),
Ok(Value::Array(vec![Value::Array(vec![Value::Array(vec![
Ok(Value::from(vec![Value::from(vec![Value::from(vec![
Value::Static(StaticNode::Null),
Value::Static(StaticNode::Null),
])])]))
Expand Down
17 changes: 11 additions & 6 deletions src/value/borrowed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pub enum Value<'value> {
/// string type
String(Cow<'value, str>),
/// array type
Array(Vec<Value<'value>>),
Array(Box<Vec<Value<'value>>>),
/// object type
Object(Box<Object<'value>>),
}
Expand Down Expand Up @@ -165,7 +165,7 @@ impl<'value> ValueBuilder<'value> for Value<'value> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[must_use]
fn array_with_capacity(capacity: usize) -> Self {
Self::Array(Vec::with_capacity(capacity))
Self::Array(Box::new(Vec::with_capacity(capacity)))
}
#[cfg_attr(not(feature = "no-inline"), inline)]
#[must_use]
Expand Down Expand Up @@ -331,7 +331,7 @@ impl<'value> ValueIntoArray for Value<'value> {

fn into_array(self) -> Option<<Self as ValueIntoArray>::Array> {
match self {
Self::Array(a) => Some(a),
Self::Array(a) => Some(*a),
_ => None,
}
}
Expand Down Expand Up @@ -432,7 +432,7 @@ impl<'de> BorrowDeserializer<'de> {
}
res.set_len(len);
}
Value::Array(res)
Value::Array(Box::new(res))
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand Down Expand Up @@ -492,7 +492,7 @@ impl<'tape, 'de> BorrowSliceDeserializer<'tape, 'de> {
}
res.set_len(len);
}
Value::Array(res)
Value::Array(Box::new(res))
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand Down Expand Up @@ -980,7 +980,7 @@ mod test {
|inner| {
prop_oneof![
// Take the inner strategy and make the two recursive cases.
prop::collection::vec(inner.clone(), 0..10).prop_map(Value::Array),
prop::collection::vec(inner.clone(), 0..10).prop_map(Value::from),
prop::collection::hash_map(".*".prop_map(Cow::from), inner, 0..10)
.prop_map(|m| m.into_iter().collect()),
]
Expand Down Expand Up @@ -1129,4 +1129,9 @@ mod test {
let v: Value = v.into();
assert_eq!(v, 42);
}

// #[test]
// fn size() {
// assert_eq!(std::mem::size_of::<Value>(), 24);
// }
}
2 changes: 1 addition & 1 deletion src/value/borrowed/from.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ impl<'value, V: Into<Value<'value>>> FromIterator<V> for Value<'value> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[must_use]
fn from_iter<I: IntoIterator<Item = V>>(iter: I) -> Self {
Value::Array(iter.into_iter().map(Into::into).collect())
Value::Array(Box::new(iter.into_iter().map(Into::into).collect()))
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/value/owned.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pub enum Value {
/// string type
String(String),
/// array type
Array(Vec<Value>),
Array(Box<Vec<Value>>),
/// object type
Object(Box<Object>),
}
Expand All @@ -101,7 +101,7 @@ impl<'input> ValueBuilder<'input> for Value {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[must_use]
fn array_with_capacity(capacity: usize) -> Self {
Self::Array(Vec::with_capacity(capacity))
Self::Array(Box::new(Vec::with_capacity(capacity)))
}
#[cfg_attr(not(feature = "no-inline"), inline)]
#[must_use]
Expand Down Expand Up @@ -244,7 +244,7 @@ impl ValueIntoArray for Value {

fn into_array(self) -> Option<<Value as ValueIntoArray>::Array> {
match self {
Self::Array(a) => Some(a),
Self::Array(a) => Some(*a),
_ => None,
}
}
Expand Down Expand Up @@ -345,7 +345,7 @@ impl<'de> OwnedDeserializer<'de> {
}
res.set_len(len);
}
Value::Array(res)
Value::Array(Box::new(res))
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand Down Expand Up @@ -825,7 +825,7 @@ mod test {
|inner| {
prop_oneof![
// Take the inner strategy and make the two recursive cases.
prop::collection::vec(inner.clone(), 0..10).prop_map(Value::Array),
prop::collection::vec(inner.clone(), 0..10).prop_map(Value::from),
prop::collection::hash_map(".*", inner, 0..10)
.prop_map(|m| m.into_iter().collect()),
]
Expand Down
2 changes: 1 addition & 1 deletion src/value/owned/cmp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ impl PartialEq<BorrowedValue<'_>> for Value {
match (self, other) {
(Self::Static(s1), BorrowedValue::Static(s2)) => s1 == s2,
(Self::String(v1), BorrowedValue::String(v2)) => v1.eq(v2),
(Self::Array(v1), BorrowedValue::Array(v2)) => v1.eq(v2),
(Self::Array(v1), BorrowedValue::Array(v2)) => v1.as_ref().eq(v2.as_ref()),
(Self::Object(v1), BorrowedValue::Object(v2)) => {
if v1.len() != v2.len() {
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/value/owned/from.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ impl<V: Into<Value>> FromIterator<V> for Value {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[must_use]
fn from_iter<I: IntoIterator<Item = V>>(iter: I) -> Self {
Self::Array(iter.into_iter().map(Into::into).collect())
Self::Array(Box::new(iter.into_iter().map(Into::into).collect()))
}
}

Expand Down
Loading