itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-11-14 04:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate try!(..).value to improve rustfmt'd code

Browse Source 
Rustfmt bails out on the original code, leaving it all on one line.
This commit is contained in:
David Tolnay 2019-02-13 09:12:19 -08:00
parent 134f268cee
commit 1668cd19d3
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
serde_derive/src/de.rs
View File

@ -2384,7 +2384,12 @@ fn deserialize_map(
let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path); let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
quote!({ quote!({
#wrapper #wrapper
try!(_serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map)).value match _serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map) {
_serde::export::Ok(__wrapper) => __wrapper.value,
_serde::export::Err(__err) => {
return _serde::export::Err(__err);
}
}
}) })
} }
}; };
@ -2615,7 +2620,12 @@ fn deserialize_map_in_place(
let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path); let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
quote!({ quote!({
#wrapper #wrapper
self.place.#member = try!(_serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map)).value self.place.#member = match _serde::de::MapAccess::next_value::<#wrapper_ty>(&mut __map) {
_serde::export::Ok(__wrapper) => __wrapper.value,
_serde::export::Err(__err) => {
return _serde::export::Err(__err);
}
};
}) })
} }
}; };