chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo the change of storing FilterDefinition in a box.

Browse Source 
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.
This commit is contained in:
Jimmy Cuadra 2019-07-08 14:24:07 -07:00
parent 2eeb90ed55
commit e7e4d04244
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/r0/sync/sync_events.rs
View File

@ -67,6 +67,7 @@ pub enum SetPresence {
/// A filter represented either as its full JSON definition or the ID of a saved filter. /// A filter represented either as its full JSON definition or the ID of a saved filter.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[allow(clippy::large_enum_variant)]
#[serde(untagged)] #[serde(untagged)]
pub enum Filter { pub enum Filter {
// The filter definition needs to be (de)serialized twice because it is a URL-encoded JSON // 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) // (there are probably some corner cases like leading whitespace)
#[serde(with = "filter_def_serde")] #[serde(with = "filter_def_serde")]
/// A complete filter definition serialized to JSON. /// A complete filter definition serialized to JSON.
FilterDefinition(Box<FilterDefinition>), FilterDefinition(FilterDefinition),
/// The ID of a filter saved on the server. /// The ID of a filter saved on the server.
FilterId(String), FilterId(String),
} }
@ -102,14 +103,13 @@ mod filter_def_serde {
} }
/// Deserialization logic for filter definitions. /// Deserialization logic for filter definitions.
pub fn deserialize<'de, D>(deserializer: D) -> Result<Box<FilterDefinition>, D::Error> pub fn deserialize<'de, D>(deserializer: D) -> Result<FilterDefinition, D::Error>
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let filter_str = <&str>::deserialize(deserializer)?; let filter_str = <&str>::deserialize(deserializer)?;
serde_json::from_str(filter_str)
.map(Box::new) serde_json::from_str(filter_str).map_err(D::Error::custom)
.map_err(D::Error::custom)
} }
} }