From 7950f3cdc52d4898aa4195b853cbec12d65bb091 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 27 Dec 2018 15:35:43 -0500 Subject: [PATCH] Format with rustfmt 2018-12-10 --- serde_derive/src/internals/ast.rs | 4 +++- serde_derive/src/internals/attr.rs | 28 ++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/serde_derive/src/internals/ast.rs b/serde_derive/src/internals/ast.rs index 442f69d1..c66b8cff 100644 --- a/serde_derive/src/internals/ast.rs +++ b/serde_derive/src/internals/ast.rs @@ -90,7 +90,9 @@ impl<'a> Container<'a> { if field.attrs.flatten() { has_flatten = true; } - field.attrs.rename_by_rules(variant.attrs.rename_all_rules()); + field + .attrs + .rename_by_rules(variant.attrs.rename_all_rules()); } } } diff --git a/serde_derive/src/internals/attr.rs b/serde_derive/src/internals/attr.rs index a02b9ea4..ba2711d4 100644 --- a/serde_derive/src/internals/attr.rs +++ b/serde_derive/src/internals/attr.rs @@ -242,7 +242,7 @@ impl Container { Ok(rename_rule) => { rename_all_ser_rule.set(&m.ident, rename_rule); rename_all_de_rule.set(&m.ident, rename_rule); - }, + } Err(()) => cx.error_spanned_by( s, format!( @@ -260,12 +260,14 @@ impl Container { if let Ok((ser, de)) = get_renames(cx, &m.nested) { if let Some(ser) = ser { match RenameRule::from_str(&ser.value()) { - Ok(rename_rule) => rename_all_ser_rule.set(&m.ident, rename_rule), + Ok(rename_rule) => { + rename_all_ser_rule.set(&m.ident, rename_rule) + } Err(()) => cx.error_spanned_by( ser, format!( "unknown rename rule for #[serde(rename_all \ - = {:?})]", + = {:?})]", ser.value(), ), ), @@ -273,12 +275,14 @@ impl Container { } if let Some(de) = de { match RenameRule::from_str(&de.value()) { - Ok(rename_rule) => rename_all_de_rule.set(&m.ident, rename_rule), + Ok(rename_rule) => { + rename_all_de_rule.set(&m.ident, rename_rule) + } Err(()) => cx.error_spanned_by( de, format!( "unknown rename rule for #[serde(rename_all \ - = {:?})]", + = {:?})]", de.value(), ), ), @@ -805,7 +809,7 @@ impl Variant { Ok(rename_rule) => { rename_all_ser_rule.set(&m.ident, rename_rule); rename_all_de_rule.set(&m.ident, rename_rule); - }, + } Err(()) => cx.error_spanned_by( s, format!( @@ -823,12 +827,14 @@ impl Variant { if let Ok((ser, de)) = get_renames(cx, &m.nested) { if let Some(ser) = ser { match RenameRule::from_str(&ser.value()) { - Ok(rename_rule) => rename_all_ser_rule.set(&m.ident, rename_rule), + Ok(rename_rule) => { + rename_all_ser_rule.set(&m.ident, rename_rule) + } Err(()) => cx.error_spanned_by( ser, format!( "unknown rename rule for #[serde(rename_all \ - = {:?})]", + = {:?})]", ser.value(), ), ), @@ -836,12 +842,14 @@ impl Variant { } if let Some(de) = de { match RenameRule::from_str(&de.value()) { - Ok(rename_rule) => rename_all_de_rule.set(&m.ident, rename_rule), + Ok(rename_rule) => { + rename_all_de_rule.set(&m.ident, rename_rule) + } Err(()) => cx.error_spanned_by( de, format!( "unknown rename rule for #[serde(rename_all \ - = {:?})]", + = {:?})]", de.value(), ), ),