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

Fix UPPERCASE rename rule variant to follow idiomatic variant naming

Browse Source 
This shouldn't have been named this way in PR #1132.
This commit is contained in:
David Tolnay 2021-01-23 14:27:28 -08:00
parent 990a502c39
commit eaccae2c46
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ pub enum RenameRule {
/// Rename direct children to "lowercase" style. /// Rename direct children to "lowercase" style.
LowerCase, LowerCase,
/// Rename direct children to "UPPERCASE" style. /// Rename direct children to "UPPERCASE" style.
UPPERCASE, UpperCase,
/// Rename direct children to "PascalCase" style, as typically used for /// Rename direct children to "PascalCase" style, as typically used for
/// enum variants. /// enum variants.
PascalCase, PascalCase,
@ -37,7 +37,7 @@ pub enum RenameRule {
static RENAME_RULES: &[(&str, RenameRule)] = &[ static RENAME_RULES: &[(&str, RenameRule)] = &[
("lowercase", LowerCase), ("lowercase", LowerCase),
("UPPERCASE", UPPERCASE), ("UPPERCASE", UpperCase),
("PascalCase", PascalCase), ("PascalCase", PascalCase),
("camelCase", CamelCase), ("camelCase", CamelCase),
("snake_case", SnakeCase), ("snake_case", SnakeCase),
@ -63,7 +63,7 @@ impl RenameRule {
match *self { match *self {
None | PascalCase => variant.to_owned(), None | PascalCase => variant.to_owned(),
LowerCase => variant.to_ascii_lowercase(), LowerCase => variant.to_ascii_lowercase(),
UPPERCASE => variant.to_ascii_uppercase(), UpperCase => variant.to_ascii_uppercase(),
CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..], CamelCase => variant[..1].to_ascii_lowercase() + &variant[1..],
SnakeCase => { SnakeCase => {
let mut snake = String::new(); let mut snake = String::new();
@ -87,7 +87,7 @@ impl RenameRule {
pub fn apply_to_field(&self, field: &str) -> String { pub fn apply_to_field(&self, field: &str) -> String {
match *self { match *self {
None | LowerCase | SnakeCase => field.to_owned(), None | LowerCase | SnakeCase => field.to_owned(),
UPPERCASE => field.to_ascii_uppercase(), UpperCase => field.to_ascii_uppercase(),
PascalCase => { PascalCase => {
let mut pascal = String::new(); let mut pascal = String::new();
let mut capitalize = true; let mut capitalize = true;
@ -149,7 +149,7 @@ fn rename_variants() {
] { ] {
assert_eq!(None.apply_to_variant(original), original); assert_eq!(None.apply_to_variant(original), original);
assert_eq!(LowerCase.apply_to_variant(original), lower); assert_eq!(LowerCase.apply_to_variant(original), lower);
assert_eq!(UPPERCASE.apply_to_variant(original), upper); assert_eq!(UpperCase.apply_to_variant(original), upper);
assert_eq!(PascalCase.apply_to_variant(original), original); assert_eq!(PascalCase.apply_to_variant(original), original);
assert_eq!(CamelCase.apply_to_variant(original), camel); assert_eq!(CamelCase.apply_to_variant(original), camel);
assert_eq!(SnakeCase.apply_to_variant(original), snake); assert_eq!(SnakeCase.apply_to_variant(original), snake);
@ -181,7 +181,7 @@ fn rename_fields() {
("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42"), ("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42"),
] { ] {
assert_eq!(None.apply_to_field(original), original); assert_eq!(None.apply_to_field(original), original);
assert_eq!(UPPERCASE.apply_to_field(original), upper); assert_eq!(UpperCase.apply_to_field(original), upper);
assert_eq!(PascalCase.apply_to_field(original), pascal); assert_eq!(PascalCase.apply_to_field(original), pascal);
assert_eq!(CamelCase.apply_to_field(original), camel); assert_eq!(CamelCase.apply_to_field(original), camel);
assert_eq!(SnakeCase.apply_to_field(original), original); assert_eq!(SnakeCase.apply_to_field(original), original);