itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 07:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests fail since modify Container attributes rename_all

Browse Source
This commit is contained in:
vinoca 2018-12-20 14:30:23 +08:00
parent 0dae5db30e
commit 7e82809592
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde_derive/src/internals/ast.rs
View File

@ -85,7 +85,7 @@ impl<'a> Container<'a> {
match data { match data {
Data::Enum(ref mut variants) => { Data::Enum(ref mut variants) => {
for variant in variants { for variant in variants {
variant.attrs.rename_by_rules(); variant.attrs.rename_by_rules(attrs.rename_all_rules());
for field in &mut variant.fields { for field in &mut variant.fields {
if field.attrs.flatten() { if field.attrs.flatten() {
has_flatten = true; has_flatten = true;

6
serde_derive/src/internals/attr.rs
View File

@ -974,12 +974,12 @@ impl Variant {
&self.name &self.name
} }
pub fn rename_by_rules(&mut self) { pub fn rename_by_rules(&mut self, rules: &RenameAllRules) {
if !self.ser_renamed { if !self.ser_renamed {
self.name.serialize = self.rename_all_rules.serialize.apply_to_variant(&self.name.serialize); self.name.serialize = rules.serialize.apply_to_variant(&self.name.serialize);
} }
if !self.de_renamed { if !self.de_renamed {
self.name.deserialize = self.rename_all_rules.deserialize.apply_to_variant(&self.name.deserialize); self.name.deserialize = rules.deserialize.apply_to_variant(&self.name.deserialize);
} }
} }

2
serde_derive/src/internals/case.rs
View File

@ -10,7 +10,7 @@ use std::str::FromStr;
use self::RenameRule::*; use self::RenameRule::*;
/// The different possible ways to change case of fields in a struct, or variants in an enum. /// The different possible ways to change case of fields in a struct, or variants in an enum.
#[derive(PartialEq, Copy, Clone)] #[derive(Copy, Clone, PartialEq, Debug)]
pub enum RenameRule { pub enum RenameRule {
/// Don't apply a default rename rule. /// Don't apply a default rename rule.
None, None,