From d6f914b9c78799edfae73f6dd439b83f552bcf5f Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 8 Oct 2018 11:28:51 -0400 Subject: [PATCH] refactor: don't use snake case --- src/models.rs | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/models.rs b/src/models.rs index e69918a..2322309 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1,28 +1,27 @@ macro_rules! ffxiv_enum { - ($(#[$meta:meta])* $name:ident { $($variant:ident => $str_repr:expr),+$(,)? }) => { - $(#[$meta])* - #[derive(Debug, Clone, Copy, Serialize, Deserialize)] - #[serde(rename_all = "snake_case")] - pub enum $name { - $($variant,)+ + ($(#[$meta:meta])* $name:ident { $($variant:ident => $str_repr:expr),+$(,)? }) => { + $(#[$meta])* + #[derive(Debug, Clone, Copy, Serialize, Deserialize)] + pub enum $name { + $($variant,)+ + } + + impl $name { + pub fn parse(s: &str) -> Option { + let res = match s.to_lowercase().as_str() { + $($str_repr => $name::$variant,)+ + _ => return None, + }; + Some(res) } - impl $name { - pub fn parse(s: &str) -> Option { - let res = match s.to_lowercase().as_str() { - $($str_repr => $name::$variant,)+ - _ => return None, - }; - Some(res) - } - - pub fn name(&self) -> &str { - match *self { - $($name::$variant => $str_repr,)+ - } + pub fn name(&self) -> &str { + match *self { + $($name::$variant => $str_repr,)+ } } } + } } pub mod character;