Complete coverage of ContentRefDeserializer::deserialize_newtype_struct

Mingun · Mingun · commit 171c6da57af7 · 2024-08-24T04:52:25.000+05:00
diff --git a/serde/src/private/de.rs b/serde/src/private/de.rs
@@ -1938,10 +1938,17 @@ mod content {
         where
             V: Visitor<'de>,
         {
+            // Covered by tests/test_enum_untagged.rs
+            //      newtype_struct
             match *self.content {
                 Content::Newtype(ref v) => {
                     visitor.visit_newtype_struct(ContentRefDeserializer::new(v))
                 }
+                // This case is necessary for formats which does not store marker of a newtype,
+                // for example, JSON. When `deserialize_any` is requested from such formats, they will
+                // report value without using `Visitor::visit_newtype_struct`, because they do not
+                // known in which contexts this value will be used.
+                // RON is example of format which preserve markers.
                 _ => visitor.visit_newtype_struct(self),
             }
         }
diff --git a/test_suite/tests/test_enum_untagged.rs b/test_suite/tests/test_enum_untagged.rs
@@ -104,6 +104,7 @@ fn newtype_unit_and_empty_map() {
     );
 }
 
+// Reaches crate::private::de::content::ContentRefDeserializer::deserialize_newtype_struct
 #[test]
 fn newtype_struct() {
     #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -116,15 +117,21 @@ fn newtype_struct() {
         Null,
     }
 
+    let value = E::Newtype(NewtypeStruct(5));
+
+    // Content::Newtype case
     assert_tokens(
-        &E::Newtype(NewtypeStruct(5)),
+        &value,
         &[
             Token::NewtypeStruct {
                 name: "NewtypeStruct",
             },
             Token::U32(5),
         ],
     );
+
+    // _ case
+    assert_de_tokens(&value, &[Token::U32(5)]);
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -1938,10 +1938,17 @@ mod content {`
`1938`	`1938`	`where`
`1939`	`1939`	`V: Visitor<'de>,`
`1940`	`1940`	`{`
	`1941`	`+ // Covered by tests/test_enum_untagged.rs`
	`1942`	`+ // newtype_struct`
`1941`	`1943`	`match *self.content {`
`1942`	`1944`	`Content::Newtype(ref v) => {`
`1943`	`1945`	`visitor.visit_newtype_struct(ContentRefDeserializer::new(v))`
`1944`	`1946`	`}`
	`1947`	`+ // This case is necessary for formats which does not store marker of a newtype,`
	`1948`	+ // for example, JSON. When `deserialize_any` is requested from such formats, they will
	`1949`	+ // report value without using `Visitor::visit_newtype_struct`, because they do not
	`1950`	`+ // known in which contexts this value will be used.`
	`1951`	`+ // RON is example of format which preserve markers.`
`1945`	`1952`	`_ => visitor.visit_newtype_struct(self),`
`1946`	`1953`	`}`
`1947`	`1954`	`}`