From ee6d258bdf2516ddaef86d78c1fb979d38974654 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Wed, 25 Nov 2020 18:10:14 +0100
Subject: [PATCH] events: Remove some needless Result wrapping

---
 ruma-events-macros/src/event.rs      | 18 ++++++++----------
 ruma-events-macros/src/event_enum.rs |  3 +--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ruma-events-macros/src/event.rs b/ruma-events-macros/src/event.rs
index 921bdf23..43c74bc6 100644
--- a/ruma-events-macros/src/event.rs
+++ b/ruma-events-macros/src/event.rs
@@ -41,10 +41,8 @@ pub fn expand_event(input: DeriveInput) -> syn::Result<TokenStream> {
         ));
     };
 
-    let serialize_impl = expand_serialize_event(&input, &var, &fields, &import_path)?;
-
-    let deserialize_impl = expand_deserialize_event(&input, &var, &fields, &import_path)?;
-
+    let serialize_impl = expand_serialize_event(&input, &var, &fields, &import_path);
+    let deserialize_impl = expand_deserialize_event(&input, &var, &fields, &import_path);
     let conversion_impl = expand_from_into(&input, &kind, &var, &fields, &import_path);
 
     let eq_impl = expand_eq_ord_event(&input, &fields);
@@ -65,7 +63,7 @@ fn expand_serialize_event(
     var: &EventKindVariation,
     fields: &[Field],
     import_path: &TokenStream,
-) -> syn::Result<TokenStream> {
+) -> TokenStream {
     let ident = &input.ident;
     let (impl_gen, ty_gen, where_clause) = input.generics.split_for_impl();
     let serialize_fields = fields
@@ -109,7 +107,7 @@ fn expand_serialize_event(
         })
         .collect::<Vec<_>>();
 
-    Ok(quote! {
+    quote! {
         impl #impl_gen #import_path::exports::serde::ser::Serialize for #ident #ty_gen #where_clause {
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where
@@ -126,7 +124,7 @@ fn expand_serialize_event(
                 state.end()
             }
         }
-    })
+    }
 }
 
 fn expand_deserialize_event(
@@ -134,7 +132,7 @@ fn expand_deserialize_event(
     var: &EventKindVariation,
     fields: &[Field],
     import_path: &TokenStream,
-) -> syn::Result<TokenStream> {
+) -> TokenStream {
     let ident = &input.ident;
     // we know there is a content field already
     let content_type = fields
@@ -265,7 +263,7 @@ fn expand_deserialize_event(
         quote! {}
     };
 
-    Ok(quote! {
+    quote! {
         impl #deserialize_impl_gen #import_path::exports::serde::de::Deserialize<'de> for #ident #ty_gen #where_clause {
             fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
             where
@@ -344,7 +342,7 @@ fn expand_deserialize_event(
                 deserializer.deserialize_map(EventVisitor(#deserialize_phantom_type))
             }
         }
-    })
+    }
 }
 
 fn expand_from_into(
diff --git a/ruma-events-macros/src/event_enum.rs b/ruma-events-macros/src/event_enum.rs
index 1700b019..fad1347d 100644
--- a/ruma-events-macros/src/event_enum.rs
+++ b/ruma-events-macros/src/event_enum.rs
@@ -754,8 +754,7 @@ fn redacted_accessor_methods(
     variants: &[EventEnumVariant],
     import_path: &TokenStream,
 ) -> Option<TokenStream> {
-    // this will never fail as it is called in `expand_any_with_deser`.
-    let ident = kind.to_event_enum_ident(var).unwrap();
+    let ident = kind.to_event_enum_ident(var)?;
     let methods = EVENT_FIELDS.iter().map(|(name, has_field)| {
         generate_accessor(name, kind, var, *has_field, variants, import_path)
     });