use simply expect

gakonst · Jan 15, 2023 · 108ca1a · 108ca1a
1 parent 69c410a
commit 108ca1a
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/ethers-contract/ethers-contract-derive/src/abi_ty.rs b/ethers-contract/ethers-contract-derive/src/abi_ty.rs
@@ -39,14 +39,7 @@ pub fn derive_tokenizeable_impl(input: &DeriveInput) -> proc_macro2::TokenStream
 
                 let assignments = fields.named.iter().map(|f| {
                     let name = f.ident.as_ref().expect("Named fields have names");
-                    let name_str = name.to_string();
-                    quote_spanned! { f.span() => #name: iter
-                        .next()
-                        .ok_or_else(|| #core_crate::abi::InvalidOutputType(::std::format!(
-                            "Struct field {:} doesn't have correspond token.", #name_str
-                        )))
-                        .and_then(|t| #core_crate::abi::Tokenizable::from_token(t))?
-                    }
+                    quote_spanned! { f.span() => #name: #core_crate::abi::Tokenizable::from_token(iter.next().expect("No token found"))? }
                 });
                 let init_struct_impl = quote! { Self { #(#assignments,)* } };
 
@@ -66,13 +59,7 @@ pub fn derive_tokenizeable_impl(input: &DeriveInput) -> proc_macro2::TokenStream
                 let tokenize_predicates = quote! { #(#tokenize_predicates,)* };
 
                 let assignments = fields.unnamed.iter().map(|f| {
-                    quote_spanned! { f.span() => iter
-                            .next()
-                            .ok_or_else(|| #core_crate::abi::InvalidOutputType(::std::format!(
-                                "Struct unnamed field doesn't have correspond token."
-                            )))
-                            .and_then(|t| #core_crate::abi::Tokenizable::from_token(t))?
-                    }
+                    quote_spanned! { f.span() => #core_crate::abi::Tokenizable::from_token(iter.next().expect("No token found"))? }
                 });
                 let init_struct_impl = quote! { Self(#(#assignments,)* ) };