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

Remove need for allow(unreachable_code)

Browse Source
This commit is contained in:
David Tolnay
2017-12-11 17:55:23 -08:00
parent 9360094ba7
commit 65104aca9c
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/de.rs
+19 -7
View File
@@ -929,7 +929,6 @@ fn deserialize_from_struct(
#visit_seq
#[inline]
#[allow(unreachable_code)]
fn visit_map<__A>(self, mut __map: __A) -> _serde::export::Result<Self::Value, __A::Error>
where __A: _serde::de::MapAccess<#delife>
{
@@ -2193,12 +2192,25 @@ fn deserialize_from_map(
.filter(|&&(field, _)| !field.attrs.skip_deserializing())
.map(
|&(field, ref name)| {
let missing_expr = Expr(expr_is_missing(&field, cattrs));
let field_name = &field.ident;
quote! {
if !#name {
self.dest.#field_name = #missing_expr;
};
let missing_expr = expr_is_missing(&field, cattrs);
// If missing_expr unconditionally returns an error, don't try
// to assign its value to self.dest. Maybe this could be handled
// more elegantly.
if missing_expr.as_ref().as_str().starts_with("return ") {
let missing_expr = Stmts(missing_expr);
quote! {
if !#name {
#missing_expr;
}
}
} else {
let field_name = &field.ident;
let missing_expr = Expr(missing_expr);
quote! {
if !#name {
self.dest.#field_name = #missing_expr;
};
}
}
},
);