mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a layer of wrapping in deserialize_with newtype struct

Browse Source
This commit is contained in:
David Tolnay 2018-05-05 00:17:00 -07:00
parent 3f0d3453d8
commit 8c3b52e308
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
serde_derive/src/de.rs
View File

@ -719,20 +719,18 @@ fn deserialize_seq_in_place(
fn deserialize_newtype_struct(type_path: &Tokens, params: &Parameters, field: &Field) -> Tokens { fn deserialize_newtype_struct(type_path: &Tokens, params: &Parameters, field: &Field) -> Tokens {
let delife = params.borrowed.de_lifetime(); let delife = params.borrowed.de_lifetime();
let field_ty = field.ty;
let value = match field.attrs.deserialize_with() { let value = match field.attrs.deserialize_with() {
None => { None => {
let field_ty = &field.ty;
quote! { quote! {
try!(<#field_ty as _serde::Deserialize>::deserialize(__e)) try!(<#field_ty as _serde::Deserialize>::deserialize(__e))
} }
} }
Some(path) => { Some(path) => {
let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path); quote! {
quote!({ try!(#path(__e))
#wrapper }
try!(<#wrapper_ty as _serde::Deserialize>::deserialize(__e)).value
})
} }
}; };
@ -749,7 +747,7 @@ fn deserialize_newtype_struct(type_path: &Tokens, params: &Parameters, field: &F
fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error> fn visit_newtype_struct<__E>(self, __e: __E) -> _serde::export::Result<Self::Value, __E::Error>
where __E: _serde::Deserializer<#delife> where __E: _serde::Deserializer<#delife>
{ {
let __field0 = #value; let __field0: #field_ty = #value;
_serde::export::Ok(#result) _serde::export::Ok(#result)
} }
} }