Less horrible logic for missing fields that unconditionally return error

2026-06-23 16:31:05 +00:00 · 2018-05-06 22:20:07 -07:00
parent 697234517d
commit 6475e73b05
2 changed files with 13 additions and 7 deletions
@@ -2539,13 +2539,9 @@ fn deserialize_map_in_place(
        .map(|&(field, ref name)| {
            let missing_expr = expr_is_missing(field, cattrs);
            // If missing_expr unconditionally returns an error, don't try
-            // to assign its value to self.place. Maybe this could be handled
-            // more elegantly.
-            if missing_expr
-                .as_ref()
-                .into_tokens()
-                .to_string()
-                .starts_with("return ")
+            // to assign its value to self.place.
+            if field.attrs.default().is_none() && cattrs.default().is_none()
+                && field.attrs.deserialize_with().is_some()
            {
                let missing_expr = Stmts(missing_expr);
                quote! {