itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 15:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1669 from H2CO3/master

Browse Source 
Allow untagged unit variants to deserialize from `Visitor::visit_none()`
This commit is contained in:
David Tolnay 2019-11-24 16:13:37 -08:00 committed by GitHub
commit ff70409215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
serde/src/private/de.rs
View File

@ -2510,6 +2510,13 @@ mod content {
{ {
Ok(()) Ok(())
} }
fn visit_none<E>(self) -> Result<(), E>
where
E: de::Error,
{
Ok(())
}
} }
} }

8
test_suite/tests/test_macros.rs
View File

@ -637,7 +637,10 @@ fn test_untagged_enum() {
], ],
); );
// Serializes to unit, deserializes from either depending on format's
// preference.
assert_tokens(&Untagged::C, &[Token::Unit]); assert_tokens(&Untagged::C, &[Token::Unit]);
assert_de_tokens(&Untagged::C, &[Token::None]);
assert_tokens(&Untagged::D(4), &[Token::U8(4)]); assert_tokens(&Untagged::D(4), &[Token::U8(4)]);
assert_tokens(&Untagged::E("e".to_owned()), &[Token::Str("e")]); assert_tokens(&Untagged::E("e".to_owned()), &[Token::Str("e")]);
@ -652,11 +655,6 @@ fn test_untagged_enum() {
], ],
); );
assert_de_tokens_error::<Untagged>(
&[Token::None],
"data did not match any variant of untagged enum Untagged",
);
assert_de_tokens_error::<Untagged>( assert_de_tokens_error::<Untagged>(
&[Token::Tuple { len: 1 }, Token::U8(1), Token::TupleEnd], &[Token::Tuple { len: 1 }, Token::U8(1), Token::TupleEnd],
"data did not match any variant of untagged enum Untagged", "data did not match any variant of untagged enum Untagged",