mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1918 from Mingun/fix-serde-test

Browse Source 
Fix incorrect message in serializer tokens and correctly implement next_entry_seed
This commit is contained in:
David Tolnay 2021-01-23 15:02:32 -08:00 committed by GitHub
commit fa6712d2bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
serde_test/src/configure.rs
View File

@ -777,6 +777,17 @@ macro_rules! impl_deserializer {
{ {
self.0.next_value_seed($wrapper(seed)) self.0.next_value_seed($wrapper(seed))
} }
fn next_entry_seed<K, V>(
&mut self,
kseed: K,
vseed: V,
) -> Result<Option<(K::Value, V::Value)>, D::Error>
where
K: DeserializeSeed<'de>,
V: DeserializeSeed<'de>,
{
self.0.next_entry_seed($wrapper(kseed), $wrapper(vseed))
}
fn size_hint(&self) -> Option<usize> { fn size_hint(&self) -> Option<usize> {
self.0.size_hint() self.0.size_hint()
} }

26
serde_test/src/ser.rs
View File

@ -32,18 +32,18 @@ impl<'a> Serializer<'a> {
} }
macro_rules! assert_next_token { macro_rules! assert_next_token {
($ser:expr, $expected:ident) => { ($ser:expr, $actual:ident) => {
assert_next_token!($ser, stringify!($expected), Token::$expected, true); assert_next_token!($ser, stringify!($actual), Token::$actual, true);
}; };
($ser:expr, $expected:ident($v:expr)) => { ($ser:expr, $actual:ident($v:expr)) => {
assert_next_token!( assert_next_token!(
$ser, $ser,
format_args!(concat!(stringify!($expected), "({:?})"), $v), format_args!(concat!(stringify!($actual), "({:?})"), $v),
Token::$expected(v), Token::$actual(v),
v == $v v == $v
); );
}; };
($ser:expr, $expected:ident { $($k:ident),* }) => { ($ser:expr, $actual:ident { $($k:ident),* }) => {
let compare = ($($k,)*); let compare = ($($k,)*);
let field_format = || { let field_format = || {
use std::fmt::Write; use std::fmt::Write;
@ -55,21 +55,21 @@ macro_rules! assert_next_token {
}; };
assert_next_token!( assert_next_token!(
$ser, $ser,
format_args!(concat!(stringify!($expected), " {{ {}}}"), field_format()), format_args!(concat!(stringify!($actual), " {{ {}}}"), field_format()),
Token::$expected { $($k),* }, Token::$actual { $($k),* },
($($k,)*) == compare ($($k,)*) == compare
); );
}; };
($ser:expr, $expected:expr, $pat:pat, $guard:expr) => { ($ser:expr, $actual:expr, $pat:pat, $guard:expr) => {
match $ser.next_token() { match $ser.next_token() {
Some($pat) if $guard => {} Some($pat) if $guard => {}
Some(other) => { Some(expected) => {
panic!("expected Token::{} but serialized as {}", panic!("expected Token::{} but serialized as {}",
$expected, other); expected, $actual);
} }
None => { None => {
panic!("expected Token::{} after end of serialized tokens", panic!("expected end of tokens, but {} was serialized",
$expected); $actual);
} }
} }
}; };