pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-22 20:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'origin/1.0' into 'origin/remote'

Browse Source 
Conflicts:
    serde_derive/src/de.rs
This commit is contained in:
David Tolnay
2017-04-09 13:19:04 -07:00
parent 5ec317a899 528ec3cdd8
commit 78f682590a
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test_suite/tests/test_de.rs
+7 -8
View File
@@ -242,14 +242,6 @@ declare_tests! {
UnitStruct => &[
Token::UnitStruct("UnitStruct"),
],
UnitStruct => &[
Token::Seq(Some(0)),
Token::SeqEnd,
],
UnitStruct => &[
Token::Seq(None),
Token::SeqEnd,
],
}
test_newtype_struct {
NewtypeStruct(1) => &[
@@ -1036,4 +1028,11 @@ declare_error_tests! {
],
Error::Message("invalid type: floating point `0`, expected isize".into()),
}
test_unit_struct_from_seq<UnitStruct> {
&[
Token::Seq(Some(0)),
Token::SeqEnd,
],
Error::Message("invalid type: sequence, expected unit struct UnitStruct".into()),
}
}