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

Fix incorrect message in serializer tokens and correctly implement next_entry_seed
serde-rs · Jan 23, 2021 · fa6712d · fa6712d
2 parents 012ea8e + 97c350a
commit fa6712d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/serde_test/src/configure.rs b/serde_test/src/configure.rs
@@ -777,6 +777,17 @@ macro_rules! impl_deserializer {
             {
                 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> {
                 self.0.size_hint()
             }

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