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

macros: Remove trait import

Browse Source
This commit is contained in:
Jonas Platte 2022-04-12 21:57:56 +02:00 committed by Jonas Platte
parent 269172dc4a
commit da222a87c9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ruma-macros/src/events/event.rs
View File

@ -191,20 +191,22 @@ fn expand_deserialize_event(
quote! { quote! {
let content = match C::has_deserialize_fields() { let content = match C::has_deserialize_fields() {
#ruma_common::events::HasDeserializeFields::False => { #ruma_common::events::HasDeserializeFields::False => {
C::empty(&event_type).map_err(A::Error::custom)? C::empty(&event_type).map_err(#serde::de::Error::custom)?
}, },
#ruma_common::events::HasDeserializeFields::True => { #ruma_common::events::HasDeserializeFields::True => {
let json = content.ok_or_else( let json = content.ok_or_else(
|| #serde::de::Error::missing_field("content"), || #serde::de::Error::missing_field("content"),
)?; )?;
C::from_parts(&event_type, &json).map_err(A::Error::custom)? C::from_parts(&event_type, &json)
.map_err(#serde::de::Error::custom)?
}, },
#ruma_common::events::HasDeserializeFields::Optional => { #ruma_common::events::HasDeserializeFields::Optional => {
let json = content.unwrap_or( let json = content.unwrap_or(
#serde_json::value::RawValue::from_string("{}".to_owned()) #serde_json::value::RawValue::from_string("{}".to_owned())
.unwrap() .unwrap()
); );
C::from_parts(&event_type, &json).map_err(A::Error::custom)? C::from_parts(&event_type, &json)
.map_err(#serde::de::Error::custom)?
}, },
}; };
} }
@ -213,7 +215,7 @@ fn expand_deserialize_event(
let content = { let content = {
let json = content let json = content
.ok_or_else(|| #serde::de::Error::missing_field("content"))?; .ok_or_else(|| #serde::de::Error::missing_field("content"))?;
C::from_parts(&event_type, &json).map_err(A::Error::custom)? C::from_parts(&event_type, &json).map_err(#serde::de::Error::custom)?
}; };
} }
} else { } else {
@ -227,7 +229,7 @@ fn expand_deserialize_event(
quote! { quote! {
let unsigned = unsigned.map(|json| { let unsigned = unsigned.map(|json| {
#ruma_common::events::StateUnsigned::_from_parts(&event_type, &json) #ruma_common::events::StateUnsigned::_from_parts(&event_type, &json)
.map_err(A::Error::custom) .map_err(#serde::de::Error::custom)
}).transpose()?.unwrap_or_default(); }).transpose()?.unwrap_or_default();
} }
} else { } else {
@ -316,8 +318,6 @@ fn expand_deserialize_event(
where where
A: #serde::de::MapAccess<'de>, A: #serde::de::MapAccess<'de>,
{ {
use #serde::de::Error as _;
let mut event_type: Option<String> = None; let mut event_type: Option<String> = None;
#( let mut #field_names: Option<#deserialize_var_types> = None; )* #( let mut #field_names: Option<#deserialize_var_types> = None; )*