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

Rename VariantAccess methods to not conflict with Deserializer

Browse Source
This commit is contained in:
David Tolnay
2017-04-15 12:35:04 -07:00
parent 4354aab93a
commit c13a37d4db
6 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+5 -5
View File
@@ -299,7 +299,7 @@ fn deserialize_tuple(
let dispatch = if let Some(deserializer) = deserializer {
quote!(_serde::Deserializer::deserialize_tuple(#deserializer, #nfields, #visitor_expr))
} else if is_enum {
quote!(_serde::de::VariantAccess::deserialize_tuple(__variant, #nfields, #visitor_expr))
quote!(_serde::de::VariantAccess::tuple_variant(__variant, #nfields, #visitor_expr))
} else if nfields == 1 {
let type_name = cattrs.name().deserialize_name();
quote!(_serde::Deserializer::deserialize_newtype_struct(__deserializer, #type_name, #visitor_expr))
@@ -508,7 +508,7 @@ fn deserialize_struct(
}
} else if is_enum {
quote! {
_serde::de::VariantAccess::deserialize_struct(__variant, FIELDS, #visitor_expr)
_serde::de::VariantAccess::struct_variant(__variant, FIELDS, #visitor_expr)
}
} else {
let type_name = cattrs.name().deserialize_name();
@@ -1048,7 +1048,7 @@ fn deserialize_externally_tagged_variant(
Style::Unit => {
let this = &params.this;
quote_block! {
try!(_serde::de::VariantAccess::deserialize_unit(__variant));
try!(_serde::de::VariantAccess::unit_variant(__variant));
_serde::export::Ok(#this::#variant_ident)
}
}
@@ -1163,7 +1163,7 @@ fn deserialize_externally_tagged_newtype_variant(
let field_ty = &field.ty;
quote_expr! {
_serde::export::Result::map(
_serde::de::VariantAccess::deserialize_newtype::<#field_ty>(__variant),
_serde::de::VariantAccess::newtype_variant::<#field_ty>(__variant),
#this::#variant_ident)
}
}
@@ -1172,7 +1172,7 @@ fn deserialize_externally_tagged_newtype_variant(
quote_block! {
#wrapper
_serde::export::Result::map(
_serde::de::VariantAccess::deserialize_newtype::<#wrapper_ty>(__variant),
_serde::de::VariantAccess::newtype_variant::<#wrapper_ty>(__variant),
|__wrapper| #this::#variant_ident(__wrapper.value))
}
}