From da222a87c98515a14148f177a3582eab6275c235 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@element.io>
Date: Tue, 12 Apr 2022 21:57:56 +0200
Subject: [PATCH] macros: Remove trait import

---
 crates/ruma-macros/src/events/event.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/ruma-macros/src/events/event.rs b/crates/ruma-macros/src/events/event.rs
index 5952c994..ad7d445b 100644
--- a/crates/ruma-macros/src/events/event.rs
+++ b/crates/ruma-macros/src/events/event.rs
@@ -191,20 +191,22 @@ fn expand_deserialize_event(
                     quote! {
                         let content = match C::has_deserialize_fields() {
                             #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 => {
                                 let json = 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)?
                             },
                             #ruma_common::events::HasDeserializeFields::Optional => {
                                 let json = content.unwrap_or(
                                     #serde_json::value::RawValue::from_string("{}".to_owned())
                                         .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 json = 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 {
@@ -227,7 +229,7 @@ fn expand_deserialize_event(
                 quote! {
                     let unsigned = unsigned.map(|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();
                 }
             } else {
@@ -316,8 +318,6 @@ fn expand_deserialize_event(
                     where
                         A: #serde::de::MapAccess<'de>,
                     {
-                        use #serde::de::Error as _;
-
                         let mut event_type: Option<String> = None;
                         #( let mut #field_names: Option<#deserialize_var_types> = None; )*