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

federation-api: Move Visitor declaration into deserialize function

Browse Source
This commit is contained in:
Jonas Platte 2020-12-15 14:35:46 +01:00
parent 212153ea5f
commit 87e821094c
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruma-federation-api/src/serde/pdu_process_response.rs
View File

@ -7,6 +7,12 @@ use serde::{
Deserialize, Serialize, Deserialize, Serialize,
}; };
#[derive(Deserialize, Serialize)]
struct WrappedError {
#[serde(skip_serializing_if = "Option::is_none")]
error: Option<String>,
}
pub fn serialize<S>( pub fn serialize<S>(
response: &BTreeMap<EventId, Result<(), String>>, response: &BTreeMap<EventId, Result<(), String>>,
serializer: S, serializer: S,
@ -33,15 +39,6 @@ pub fn deserialize<'de, D>(
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
deserializer.deserialize_map(PduProcessResponseVisitor)
}
#[derive(Deserialize, Serialize)]
struct WrappedError {
#[serde(skip_serializing_if = "Option::is_none")]
error: Option<String>,
}
struct PduProcessResponseVisitor; struct PduProcessResponseVisitor;
impl<'de> Visitor<'de> for PduProcessResponseVisitor { impl<'de> Visitor<'de> for PduProcessResponseVisitor {
@ -68,6 +65,9 @@ impl<'de> Visitor<'de> for PduProcessResponseVisitor {
} }
} }
deserializer.deserialize_map(PduProcessResponseVisitor)
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::collections::BTreeMap; use std::collections::BTreeMap;