pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-29 18:47:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix identifier deserialization from non-u32

Browse Source 
Closes #962
This commit is contained in:
Steven Fackler
2017-06-19 20:21:52 -07:00
parent 4fdba725fe
commit 8e8694261b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+2 -2
View File
@@ -1387,10 +1387,10 @@ fn deserialize_identifier(
}; };
let visit_index = if is_variant { let visit_index = if is_variant {
let variant_indices = 0u32..; let variant_indices = 0u64..;
let fallthrough_msg = format!("variant index 0 <= i < {}", fields.len()); let fallthrough_msg = format!("variant index 0 <= i < {}", fields.len());
let visit_index = quote! { let visit_index = quote! {
fn visit_u32<__E>(self, __value: u32) -> _serde::export::Result<Self::Value, __E> fn visit_u64<__E>(self, __value: u64) -> _serde::export::Result<Self::Value, __E>
where __E: _serde::de::Error where __E: _serde::de::Error
{ {
match __value { match __value {
test_suite/tests/test_identifier.rs
+3
View File
@@ -23,7 +23,10 @@ fn test_variant_identifier() {
Bbb, Bbb,
} }
assert_de_tokens(&V::Aaa, &[Token::U8(0)]);
assert_de_tokens(&V::Aaa, &[Token::U16(0)]);
assert_de_tokens(&V::Aaa, &[Token::U32(0)]); assert_de_tokens(&V::Aaa, &[Token::U32(0)]);
assert_de_tokens(&V::Aaa, &[Token::U64(0)]);
assert_de_tokens(&V::Aaa, &[Token::Str("Aaa")]); assert_de_tokens(&V::Aaa, &[Token::Str("Aaa")]);
assert_de_tokens(&V::Aaa, &[Token::Bytes(b"Aaa")]); assert_de_tokens(&V::Aaa, &[Token::Bytes(b"Aaa")]);
} }