pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-25 11:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hygiene of macro-generated local variable accesses in serde(with) wrappers

Browse Source
This commit is contained in:
David Tolnay
2024-10-22 09:35:52 -07:00
parent 0058c7226e
commit 1e36ef551d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+3 -2
View File
@@ -2882,13 +2882,14 @@ fn wrap_deserialize_with(
let (de_impl_generics, de_ty_generics, ty_generics, where_clause) =
split_with_de_lifetime(params);
let delife = params.borrowed.de_lifetime();
let deserializer_var = quote!(__deserializer);
// If #deserialize_with returns wrong type, error will be reported here (^^^^^).
// We attach span of the path to the function so it will be reported
// on the #[serde(with = "...")]
// ^^^^^
let value = quote_spanned! {deserialize_with.span()=>
#deserialize_with(__deserializer)?
#deserialize_with(#deserializer_var)?
};
let wrapper = quote! {
#[doc(hidden)]
@@ -2899,7 +2900,7 @@ fn wrap_deserialize_with(
}
impl #de_impl_generics _serde::Deserialize<#delife> for __DeserializeWith #de_ty_generics #where_clause {
fn deserialize<__D>(__deserializer: __D) -> _serde::__private::Result<Self, __D::Error>
fn deserialize<__D>(#deserializer_var: __D) -> _serde::__private::Result<Self, __D::Error>
where
__D: _serde::Deserializer<#delife>,
{
serde_derive/src/ser.rs
+5 -2
View File
@@ -1220,12 +1220,15 @@ fn wrap_serialize_with(
})
});
let self_var = quote!(self);
let serializer_var = quote!(__s);
// If #serialize_with returns wrong type, error will be reported on here.
// We attach span of the path to this piece so error will be reported
// on the #[serde(with = "...")]
// ^^^^^
let wrapper_serialize = quote_spanned! {serialize_with.span()=>
#serialize_with(#(self.values.#field_access, )* __s)
#serialize_with(#(#self_var.values.#field_access, )* #serializer_var)
};
quote!({
@@ -1236,7 +1239,7 @@ fn wrap_serialize_with(
}
impl #wrapper_impl_generics _serde::Serialize for __SerializeWith #wrapper_ty_generics #where_clause {
fn serialize<__S>(&self, __s: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
fn serialize<__S>(&#self_var, #serializer_var: __S) -> _serde::__private::Result<__S::Ok, __S::Error>
where
__S: _serde::Serializer,
{