Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

remove EthAbiType derive generated unwrap #2056

Merged
merged 2 commits into from
Jan 17, 2023
Merged

remove EthAbiType derive generated unwrap #2056

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69c410a
remove EthAbiType derive generated unwrap
zsluedem Jan 15, 2023
9dcc5a2
use simply expect
zsluedem Jan 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ethers-contract/ethers-contract-derive/src/abi_ty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +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");
quote_spanned! { f.span() => #name: #core_crate::abi::Tokenizable::from_token(iter.next().unwrap())? }
quote_spanned! { f.span() => #name: #core_crate::abi::Tokenizable::from_token(iter.next().expect("The iter is guaranteed to be something due to the size check"))? }
});
let init_struct_impl = quote! { Self { #(#assignments,)* } };

Expand All @@ -59,7 +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() => #core_crate::abi::Tokenizable::from_token(iter.next().unwrap())? }
quote_spanned! { f.span() => #core_crate::abi::Tokenizable::from_token(iter.next().expect("The iter is guaranteed to be something due to the size check"))? }
});
let init_struct_impl = quote! { Self(#(#assignments,)* ) };

Expand Down