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

Enforce unit struct for #[serde(other)]

Browse Source
This commit is contained in:
roblabla 2018-09-11 17:12:37 +00:00
parent 0156f1355a
commit dcd2232f69
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serde_derive/src/de.rs
View File

@ -1866,8 +1866,8 @@ fn deserialize_generated_identifier(
let ignore_variant = quote!(__other(_serde::private::de::Content<'de>),);
let fallthrough = quote!(_serde::export::Ok(__Field::__other(__value)));
(Some(ignore_variant), Some(fallthrough))
} else if other_idx.is_some() {
let ignore_variant = fields[other_idx.unwrap()].1.clone();
} else if let Some(other_idx) = other_idx {
let ignore_variant = fields[other_idx].1.clone();
let fallthrough = quote!(_serde::export::Ok(__Field::#ignore_variant));
(None, Some(fallthrough))
} else if is_variant || cattrs.deny_unknown_fields() {

5
serde_derive/src/internals/check.rs
View File

@ -124,15 +124,14 @@ fn check_identifier(cx: &Ctxt, cont: &Container) {
}
// Variant with `other` attribute must be the last one.
(Style::Unit, Identifier::Field, true, _) | (_, Identifier::No, true, _) => {
(Style::Unit, Identifier::Field, true, _) | (Style::Unit, Identifier::No, true, _) => {
if i < variants.len() - 1 {
cx.error("#[serde(other)] must be the last variant");
}
}
// Variant with `other` attribute must be a unit variant.
// TODO: Only in field_identifier ?
(_, Identifier::Field, true, _) => {
(_, Identifier::Field, true, _) | (_, Identifier::No, true, _) => {
cx.error("#[serde(other)] must be on a unit variant");
},