From c5810076fc10fb206c1bae746c737b047e0da1c6 Mon Sep 17 00:00:00 2001 From: Mingwei Samuel Date: Tue, 5 Mar 2024 11:54:53 -0800 Subject: [PATCH] fix: cleanup loose `GameType` serde code --- riven/src/consts/game_type.rs | 33 ----------------------------- riven/srcgen/consts/game_type.rs.dt | 33 ----------------------------- riven/srcgen/models.rs.dt | 2 +- 3 files changed, 1 insertion(+), 67 deletions(-) diff --git a/riven/src/consts/game_type.rs b/riven/src/consts/game_type.rs index 010ecee..fc2ba0f 100644 --- a/riven/src/consts/game_type.rs +++ b/riven/src/consts/game_type.rs @@ -31,38 +31,5 @@ pub enum GameType { TUTORIAL_GAME, } -impl GameType { - /// https://github.com/RiotGames/developer-relations/issues/898 - pub(crate) fn serialize_empty( - val: &Option, - serializer: S, - ) -> Result - where - S: serde::ser::Serializer, - { - use serde::ser::Serialize; - if let Some(val) = val { - val.serialize(serializer) - } else { - "".serialize(serializer) - } - } - - /// https://github.com/RiotGames/developer-relations/issues/898 - pub(crate) fn deserialize_empty<'de, D>( - deserializer: D, - ) -> Result, D::Error> - where - D: serde::de::Deserializer<'de>, - { - use serde::de::IntoDeserializer; - let opt = Option::::deserialize(deserializer)?; - match opt.as_deref() { - None | Some("") => Ok(None), - Some(s) => Self::deserialize(s.into_deserializer()).map(Some) - } - } -} - #[cfg(test)] mod test; diff --git a/riven/srcgen/consts/game_type.rs.dt b/riven/srcgen/consts/game_type.rs.dt index 78e269c..5cf4dde 100644 --- a/riven/srcgen/consts/game_type.rs.dt +++ b/riven/srcgen/consts/game_type.rs.dt @@ -29,38 +29,5 @@ pub enum GameType { }} } -impl GameType { - /// https://github.com/RiotGames/developer-relations/issues/898 - pub(crate) fn serialize_empty( - val: &Option, - serializer: S, - ) -> Result - where - S: serde::ser::Serializer, - { - use serde::ser::Serialize; - if let Some(val) = val { - val.serialize(serializer) - } else { - "".serialize(serializer) - } - } - - /// https://github.com/RiotGames/developer-relations/issues/898 - pub(crate) fn deserialize_empty<'de, D>( - deserializer: D, - ) -> Result, D::Error> - where - D: serde::de::Deserializer<'de>, - { - use serde::de::IntoDeserializer; - let opt = Option::::deserialize(deserializer)?; - match opt.as_deref() { - None | Some("") => Ok(None), - Some(s) => Self::deserialize(s.into_deserializer()).map(Some) - } - } -} - #[cfg(test)] mod test; diff --git a/riven/srcgen/models.rs.dt b/riven/srcgen/models.rs.dt index 32d319b..77f756b 100644 --- a/riven/srcgen/models.rs.dt +++ b/riven/srcgen/models.rs.dt @@ -73,7 +73,7 @@ pub mod {{= dotUtils.changeCase.snakeCase(endpoint) }} { /// Will be `None` if empty string is returned: https://github.com/RiotGames/developer-relations/issues/898 #[serde(serialize_with = "crate::consts::serialize_empty_string_none")] #[serde(deserialize_with = "crate::consts::deserialize_empty_string_none")] - pub {{= name }}: Option<{{= dotUtils.stringifyType(prop, {}) }}>, + pub {{= name }}: Option, {{??}} pub {{= name }}: {{= dotUtils.stringifyType(prop, { optional }) }}, {{?}}