Skip to content

Add to_slice serialization function #36

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

Merged
merged 4 commits into from
Dec 11, 2020
Merged

Add to_slice serialization function #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7959658
Add a to_slice function when serializing, that allows serialization i…
MathiasKoch Jul 22, 2020
95b7a15
Remove temporary test error variant
MathiasKoch Jul 22, 2020
109211a
Rename idx to current_length, and remove unnecessary explicit returns
MathiasKoch Dec 11, 2020
0e5bbfb
Rebase on master and fix tests following the merge of #26
MathiasKoch Dec 11, 2020
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
188 changes: 109 additions & 79 deletions src/de/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,22 +741,22 @@ mod tests {

#[test]
fn array() {
assert_eq!(crate::from_str::<[i32; 0]>("[]"), Ok([]));
assert_eq!(crate::from_str("[0, 1, 2]"), Ok([0, 1, 2]));
assert_eq!(crate::from_str::<[i32; 0]>("[]"), Ok(([], 2)));
assert_eq!(crate::from_str("[0, 1, 2]"), Ok(([0, 1, 2], 9)));

// errors
assert!(crate::from_str::<[i32; 2]>("[0, 1,]").is_err());
}

#[test]
fn bool() {
assert_eq!(crate::from_str("true"), Ok(true));
assert_eq!(crate::from_str(" true"), Ok(true));
assert_eq!(crate::from_str("true "), Ok(true));
assert_eq!(crate::from_str("true"), Ok((true, 4)));
assert_eq!(crate::from_str(" true"), Ok((true, 5)));
assert_eq!(crate::from_str("true "), Ok((true, 5)));

assert_eq!(crate::from_str("false"), Ok(false));
assert_eq!(crate::from_str(" false"), Ok(false));
assert_eq!(crate::from_str("false "), Ok(false));
assert_eq!(crate::from_str("false"), Ok((false, 5)));
assert_eq!(crate::from_str(" false"), Ok((false, 6)));
assert_eq!(crate::from_str("false "), Ok((false, 6)));

// errors
assert!(crate::from_str::<bool>("true false").is_err());
Expand All @@ -765,42 +765,54 @@ mod tests {

#[test]
fn enum_clike() {
assert_eq!(crate::from_str(r#" "boolean" "#), Ok(Type::Boolean));
assert_eq!(crate::from_str(r#" "number" "#), Ok(Type::Number));
assert_eq!(crate::from_str(r#" "thing" "#), Ok(Type::Thing));
assert_eq!(crate::from_str(r#" "boolean" "#), Ok((Type::Boolean, 11)));
assert_eq!(crate::from_str(r#" "number" "#), Ok((Type::Number, 10)));
assert_eq!(crate::from_str(r#" "thing" "#), Ok((Type::Thing, 9)));
}

#[test]
fn str() {
assert_eq!(crate::from_str(r#" "hello" "#), Ok("hello"));
assert_eq!(crate::from_str(r#" "" "#), Ok(""));
assert_eq!(crate::from_str(r#" " " "#), Ok(" "));
assert_eq!(crate::from_str(r#" "👏" "#), Ok("👏"));
assert_eq!(crate::from_str(r#" "hello" "#), Ok(("hello", 9)));
assert_eq!(crate::from_str(r#" "" "#), Ok(("", 4)));
assert_eq!(crate::from_str(r#" " " "#), Ok((" ", 5)));
assert_eq!(crate::from_str(r#" "👏" "#), Ok(("👏", 8)));

// no unescaping is done (as documented as a known issue in lib.rs)
assert_eq!(crate::from_str(r#" "hel\tlo" "#), Ok("hel\\tlo"));
assert_eq!(crate::from_str(r#" "hello \\" "#), Ok("hello \\\\"));
assert_eq!(crate::from_str(r#" "hel\tlo" "#), Ok(("hel\\tlo", 11)));
assert_eq!(crate::from_str(r#" "hello \\" "#), Ok(("hello \\\\", 12)));

// escaped " in the string content
assert_eq!(crate::from_str(r#" "foo\"bar" "#), Ok(r#"foo\"bar"#));
assert_eq!(crate::from_str(r#" "foo\\\"bar" "#), Ok(r#"foo\\\"bar"#));
assert_eq!(crate::from_str(r#" "foo\"\"bar" "#), Ok(r#"foo\"\"bar"#));
assert_eq!(crate::from_str(r#" "\"bar" "#), Ok(r#"\"bar"#));
assert_eq!(crate::from_str(r#" "foo\"" "#), Ok(r#"foo\""#));
assert_eq!(crate::from_str(r#" "\"" "#), Ok(r#"\""#));
assert_eq!(crate::from_str(r#" "foo\"bar" "#), Ok((r#"foo\"bar"#, 12)));
assert_eq!(
crate::from_str(r#" "foo\\\"bar" "#),
Ok((r#"foo\\\"bar"#, 14))
);
assert_eq!(
crate::from_str(r#" "foo\"\"bar" "#),
Ok((r#"foo\"\"bar"#, 14))
);
assert_eq!(crate::from_str(r#" "\"bar" "#), Ok((r#"\"bar"#, 9)));
assert_eq!(crate::from_str(r#" "foo\"" "#), Ok((r#"foo\""#, 9)));
assert_eq!(crate::from_str(r#" "\"" "#), Ok((r#"\""#, 6)));

// non-excaped " preceded by backslashes
assert_eq!(crate::from_str(r#" "foo bar\\" "#), Ok(r#"foo bar\\"#));
assert_eq!(crate::from_str(r#" "foo bar\\\\" "#), Ok(r#"foo bar\\\\"#));
assert_eq!(
crate::from_str(r#" "foo bar\\" "#),
Ok((r#"foo bar\\"#, 13))
);
assert_eq!(
crate::from_str(r#" "foo bar\\\\" "#),
Ok((r#"foo bar\\\\"#, 15))
);
assert_eq!(
crate::from_str(r#" "foo bar\\\\\\" "#),
Ok(r#"foo bar\\\\\\"#)
Ok((r#"foo bar\\\\\\"#, 17))
);
assert_eq!(
crate::from_str(r#" "foo bar\\\\\\\\" "#),
Ok(r#"foo bar\\\\\\\\"#)
Ok((r#"foo bar\\\\\\\\"#, 19))
);
assert_eq!(crate::from_str(r#" "\\" "#), Ok(r#"\\"#));
assert_eq!(crate::from_str(r#" "\\" "#), Ok((r#"\\"#, 6)));
}

#[test]
Expand All @@ -810,10 +822,13 @@ mod tests {
led: bool,
}

assert_eq!(crate::from_str(r#"{ "led": true }"#), Ok(Led { led: true }));
assert_eq!(
crate::from_str(r#"{ "led": true }"#),
Ok((Led { led: true }, 15))
);
assert_eq!(
crate::from_str(r#"{ "led": false }"#),
Ok(Led { led: false })
Ok((Led { led: false }, 16))
);
}

Expand All @@ -826,17 +841,17 @@ mod tests {

assert_eq!(
crate::from_str(r#"{ "temperature": -17 }"#),
Ok(Temperature { temperature: -17 })
Ok((Temperature { temperature: -17 }, 22))
);

assert_eq!(
crate::from_str(r#"{ "temperature": -0 }"#),
Ok(Temperature { temperature: -0 })
Ok((Temperature { temperature: -0 }, 21))
);

assert_eq!(
crate::from_str(r#"{ "temperature": 0 }"#),
Ok(Temperature { temperature: 0 })
Ok((Temperature { temperature: 0 }, 20))
);

// out of range
Expand All @@ -853,33 +868,39 @@ mod tests {

assert_eq!(
crate::from_str(r#"{ "temperature": -17.2 }"#),
Ok(Temperature { temperature: -17.2 })
Ok((Temperature { temperature: -17.2 }, 24))
);

assert_eq!(
crate::from_str(r#"{ "temperature": -0.0 }"#),
Ok(Temperature { temperature: -0. })
Ok((Temperature { temperature: -0. }, 23))
);

assert_eq!(
crate::from_str(r#"{ "temperature": -2.1e-3 }"#),
Ok(Temperature {
temperature: -2.1e-3
})
Ok((
Temperature {
temperature: -2.1e-3
},
26
))
);

assert_eq!(
crate::from_str(r#"{ "temperature": -3 }"#),
Ok(Temperature { temperature: -3. })
Ok((Temperature { temperature: -3. }, 21))
);

use core::f32;

assert_eq!(
crate::from_str(r#"{ "temperature": -1e500 }"#),
Ok(Temperature {
temperature: f32::NEG_INFINITY
})
Ok((
Temperature {
temperature: f32::NEG_INFINITY
},
25
))
);

assert!(crate::from_str::<Temperature>(r#"{ "temperature": 1e1e1 }"#).is_err());
Expand All @@ -899,17 +920,23 @@ mod tests {

assert_eq!(
crate::from_str(r#"{ "description": "An ambient temperature sensor" }"#),
Ok(Property {
description: Some("An ambient temperature sensor"),
})
Ok((
Property {
description: Some("An ambient temperature sensor"),
},
50
))
);

assert_eq!(
crate::from_str(r#"{ "description": null }"#),
Ok(Property { description: None })
Ok((Property { description: None }, 23))
);

assert_eq!(crate::from_str(r#"{}"#), Ok(Property { description: None }));
assert_eq!(
crate::from_str(r#"{}"#),
Ok((Property { description: None }, 2))
);
}

#[test]
Expand All @@ -921,12 +948,12 @@ mod tests {

assert_eq!(
crate::from_str(r#"{ "temperature": 20 }"#),
Ok(Temperature { temperature: 20 })
Ok((Temperature { temperature: 20 }, 21))
);

assert_eq!(
crate::from_str(r#"{ "temperature": 0 }"#),
Ok(Temperature { temperature: 0 })
Ok((Temperature { temperature: 0 }, 20))
);

// out of range
Expand All @@ -940,8 +967,8 @@ mod tests {
#[derive(Debug, Deserialize, PartialEq)]
struct Xy(i8, i8);

assert_eq!(crate::from_str(r#"[10, 20]"#), Ok(Xy(10, 20)));
assert_eq!(crate::from_str(r#"[10, -20]"#), Ok(Xy(10, -20)));
assert_eq!(crate::from_str(r#"[10, 20]"#), Ok((Xy(10, 20), 8)));
assert_eq!(crate::from_str(r#"[10, -20]"#), Ok((Xy(10, -20), 9)));

// wrong number of args
assert_eq!(
Expand All @@ -960,8 +987,8 @@ mod tests {
#[derive(Debug, Deserialize, PartialEq)]
struct Xy(i8, i8);

assert_eq!(crate::from_str(r#"[10, 20]"#), Ok(Xy(10, 20)));
assert_eq!(crate::from_str(r#"[10, -20]"#), Ok(Xy(10, -20)));
assert_eq!(crate::from_str(r#"[10, 20]"#), Ok((Xy(10, 20), 8)));
assert_eq!(crate::from_str(r#"[10, -20]"#), Ok((Xy(10, -20), 9)));

// wrong number of args
assert_eq!(
Expand All @@ -985,31 +1012,31 @@ mod tests {

assert_eq!(
crate::from_str(r#"{ "temperature": 20, "high": 80, "low": -10, "updated": true }"#),
Ok(Temperature { temperature: 20 })
Ok((Temperature { temperature: 20 }, 62))
);

assert_eq!(
crate::from_str(
r#"{ "temperature": 20, "conditions": "windy", "forecast": "cloudy" }"#
),
Ok(Temperature { temperature: 20 })
Ok((Temperature { temperature: 20 }, 66))
);

assert_eq!(
crate::from_str(r#"{ "temperature": 20, "hourly_conditions": ["windy", "rainy"] }"#),
Ok(Temperature { temperature: 20 })
Ok((Temperature { temperature: 20 }, 62))
);

assert_eq!(
crate::from_str(
r#"{ "temperature": 20, "source": { "station": "dock", "sensors": ["front", "back"] } }"#
),
Ok(Temperature { temperature: 20 })
Ok((Temperature { temperature: 20 }, 84))
);

assert_eq!(
crate::from_str(r#"{ "temperature": 20, "invalid": this-is-ignored }"#),
Ok(Temperature { temperature: 20 })
Ok((Temperature { temperature: 20 }, 49))
);

assert_eq!(
Expand Down Expand Up @@ -1107,29 +1134,32 @@ mod tests {
}
"#
),
Ok(Thing {
properties: Properties {
temperature: Property {
ty: Type::Number,
unit: Some("celsius"),
description: Some("An ambient temperature sensor"),
href: "/properties/temperature",
},
humidity: Property {
ty: Type::Number,
unit: Some("percent"),
description: None,
href: "/properties/humidity",
},
led: Property {
ty: Type::Boolean,
unit: None,
description: Some("A red LED"),
href: "/properties/led",
Ok((
Thing {
properties: Properties {
temperature: Property {
ty: Type::Number,
unit: Some("celsius"),
description: Some("An ambient temperature sensor"),
href: "/properties/temperature",
},
humidity: Property {
ty: Type::Number,
unit: Some("percent"),
description: None,
href: "/properties/humidity",
},
led: Property {
ty: Type::Boolean,
unit: None,
description: Some("A red LED"),
href: "/properties/led",
},
},
ty: Type::Thing,
},
ty: Type::Thing,
})
852
))
)
}
}
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub mod ser;
#[doc(inline)]
pub use self::de::{from_slice, from_str};
#[doc(inline)]
pub use self::ser::{to_string, to_vec};
pub use self::ser::{to_slice, to_string, to_vec};

#[allow(deprecated)]
unsafe fn uninitialized<T>() -> T {
Expand Down
Loading