From e7e4d04244eafc6d8633aaddf54b157e524fd5ad Mon Sep 17 00:00:00 2001 From: Jimmy Cuadra Date: Mon, 8 Jul 2019 14:24:07 -0700 Subject: [PATCH] Undo the change of storing FilterDefinition in a box. On second thought, it doesn't make sense to change this just cause of a clippy warning. We'll wait and see if it ever causes and real problems before making the API less consistent just to avoid a potential space saving issue. --- src/r0/sync/sync_events.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/r0/sync/sync_events.rs b/src/r0/sync/sync_events.rs index 5bdc1048..45d95b6f 100644 --- a/src/r0/sync/sync_events.rs +++ b/src/r0/sync/sync_events.rs @@ -67,6 +67,7 @@ pub enum SetPresence { /// A filter represented either as its full JSON definition or the ID of a saved filter. #[derive(Clone, Debug, Deserialize, Serialize)] +#[allow(clippy::large_enum_variant)] #[serde(untagged)] pub enum Filter { // The filter definition needs to be (de)serialized twice because it is a URL-encoded JSON @@ -81,7 +82,7 @@ pub enum Filter { // (there are probably some corner cases like leading whitespace) #[serde(with = "filter_def_serde")] /// A complete filter definition serialized to JSON. - FilterDefinition(Box), + FilterDefinition(FilterDefinition), /// The ID of a filter saved on the server. FilterId(String), } @@ -102,14 +103,13 @@ mod filter_def_serde { } /// Deserialization logic for filter definitions. - pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error> + pub fn deserialize<'de, D>(deserializer: D) -> Result where D: Deserializer<'de>, { let filter_str = <&str>::deserialize(deserializer)?; - serde_json::from_str(filter_str) - .map(Box::new) - .map_err(D::Error::custom) + + serde_json::from_str(filter_str).map_err(D::Error::custom) } }