pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 13:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format with rustfmt 2018-12-10

Browse Source
This commit is contained in:
David Tolnay
2018-12-27 15:35:43 -05:00
parent b87f8f35ee
commit 7950f3cdc5
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_derive/src/internals/ast.rs
+3 -1
View File
@@ -90,7 +90,9 @@ impl<'a> Container<'a> {
if field.attrs.flatten() { if field.attrs.flatten() {
has_flatten = true; has_flatten = true;
} }
field.attrs.rename_by_rules(variant.attrs.rename_all_rules()); field
.attrs
.rename_by_rules(variant.attrs.rename_all_rules());
} }
} }
} }
serde_derive/src/internals/attr.rs
+18 -10
View File
@@ -242,7 +242,7 @@ impl Container {
Ok(rename_rule) => { Ok(rename_rule) => {
rename_all_ser_rule.set(&m.ident, rename_rule); rename_all_ser_rule.set(&m.ident, rename_rule);
rename_all_de_rule.set(&m.ident, rename_rule); rename_all_de_rule.set(&m.ident, rename_rule);
}, }
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
s, s,
format!( format!(
@@ -260,12 +260,14 @@ impl Container {
if let Ok((ser, de)) = get_renames(cx, &m.nested) { if let Ok((ser, de)) = get_renames(cx, &m.nested) {
if let Some(ser) = ser { if let Some(ser) = ser {
match RenameRule::from_str(&ser.value()) { 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( Err(()) => cx.error_spanned_by(
ser, ser,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all \
= {:?})]", = {:?})]",
ser.value(), ser.value(),
), ),
), ),
@@ -273,12 +275,14 @@ impl Container {
} }
if let Some(de) = de { if let Some(de) = de {
match RenameRule::from_str(&de.value()) { 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( Err(()) => cx.error_spanned_by(
de, de,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all \
= {:?})]", = {:?})]",
de.value(), de.value(),
), ),
), ),
@@ -805,7 +809,7 @@ impl Variant {
Ok(rename_rule) => { Ok(rename_rule) => {
rename_all_ser_rule.set(&m.ident, rename_rule); rename_all_ser_rule.set(&m.ident, rename_rule);
rename_all_de_rule.set(&m.ident, rename_rule); rename_all_de_rule.set(&m.ident, rename_rule);
}, }
Err(()) => cx.error_spanned_by( Err(()) => cx.error_spanned_by(
s, s,
format!( format!(
@@ -823,12 +827,14 @@ impl Variant {
if let Ok((ser, de)) = get_renames(cx, &m.nested) { if let Ok((ser, de)) = get_renames(cx, &m.nested) {
if let Some(ser) = ser { if let Some(ser) = ser {
match RenameRule::from_str(&ser.value()) { 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( Err(()) => cx.error_spanned_by(
ser, ser,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all \
= {:?})]", = {:?})]",
ser.value(), ser.value(),
), ),
), ),
@@ -836,12 +842,14 @@ impl Variant {
} }
if let Some(de) = de { if let Some(de) = de {
match RenameRule::from_str(&de.value()) { 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( Err(()) => cx.error_spanned_by(
de, de,
format!( format!(
"unknown rename rule for #[serde(rename_all \ "unknown rename rule for #[serde(rename_all \
= {:?})]", = {:?})]",
de.value(), de.value(),
), ),
), ),