From 7e828095929072c1e1df02e349b2b1103f35d469 Mon Sep 17 00:00:00 2001 From: vinoca Date: Thu, 20 Dec 2018 14:30:23 +0800 Subject: [PATCH] Fix tests fail since modify Container attributes rename_all --- serde_derive/src/internals/ast.rs | 2 +- serde_derive/src/internals/attr.rs | 6 +++--- serde_derive/src/internals/case.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/serde_derive/src/internals/ast.rs b/serde_derive/src/internals/ast.rs index fd11f64b..442f69d1 100644 --- a/serde_derive/src/internals/ast.rs +++ b/serde_derive/src/internals/ast.rs @@ -85,7 +85,7 @@ impl<'a> Container<'a> { match data { Data::Enum(ref mut 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 { if field.attrs.flatten() { has_flatten = true; diff --git a/serde_derive/src/internals/attr.rs b/serde_derive/src/internals/attr.rs index d3f636b6..6b539611 100644 --- a/serde_derive/src/internals/attr.rs +++ b/serde_derive/src/internals/attr.rs @@ -974,12 +974,12 @@ impl Variant { &self.name } - pub fn rename_by_rules(&mut self) { + pub fn rename_by_rules(&mut self, rules: &RenameAllRules) { 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 { - 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); } } diff --git a/serde_derive/src/internals/case.rs b/serde_derive/src/internals/case.rs index 80da5a98..748436e6 100644 --- a/serde_derive/src/internals/case.rs +++ b/serde_derive/src/internals/case.rs @@ -10,7 +10,7 @@ use std::str::FromStr; use self::RenameRule::*; /// 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 { /// Don't apply a default rename rule. None,