Format with rustfmt 0.99.4

This commit is contained in:
David Tolnay
2018-09-11 23:00:08 -07:00
parent 2753ec757b
commit 53fe1b328e
4 changed files with 10 additions and 12 deletions
+4 -4
View File
@@ -1172,7 +1172,7 @@ fn deserialize_externally_tagged_enum(
&variant_names_idents,
cattrs,
true,
other_idx
other_idx,
));
// Match arms to extract a variant from a string
@@ -1275,7 +1275,7 @@ fn deserialize_internally_tagged_enum(
&variant_names_idents,
cattrs,
true,
other_idx
other_idx,
));
// Match arms to extract a variant from a string
@@ -1349,7 +1349,7 @@ fn deserialize_adjacently_tagged_enum(
&variant_names_idents,
cattrs,
true,
other_idx
other_idx,
));
let variant_arms: &Vec<_> = &variants
@@ -1857,7 +1857,7 @@ fn deserialize_generated_identifier(
fields: &[(String, Ident)],
cattrs: &attr::Container,
is_variant: bool,
other_idx: Option<usize>
other_idx: Option<usize>,
) -> Fragment {
let this = quote!(__Field);
let field_idents: &Vec<_> = &fields.iter().map(|&(_, ref ident)| ident).collect();
+3 -3
View File
@@ -111,12 +111,12 @@ fn check_identifier(cx: &Ctxt, cont: &Container) {
variant.style,
cont.attrs.identifier(),
variant.attrs.other(),
cont.attrs.tag()
cont.attrs.tag(),
) {
// The `other` attribute may not be used in a variant_identifier.
(_, Identifier::Variant, true, _) => {
cx.error("#[serde(other)] may not be used on a variant_identifier");
},
}
// Variant with `other` attribute cannot appear in untagged enum
(_, Identifier::No, true, &EnumTag::None) => {
@@ -133,7 +133,7 @@ fn check_identifier(cx: &Ctxt, cont: &Container) {
// Variant with `other` attribute must be a unit variant.
(_, Identifier::Field, true, _) | (_, Identifier::No, true, _) => {
cx.error("#[serde(other)] must be on a unit variant");
},
}
// Any sort of variant is allowed if this is not an identifier.
(_, Identifier::No, false, _) => {}