difftreelog
refactor change panic to syn::Error
in: master
3 files changed
crates/evm-coder/procedural/src/abi_derive.rsdiffbeforeafterboth1use quote::quote;23pub(crate) fn impl_abi_macro(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {4 // dbg!(ast);5 let name = &ast.ident;6 let can_be_plcaed_in_vec = impl_can_be_placed_in_vec(name);7 let abi_type = impl_abi_type(ast);8 // println!("{}", abi_type);9 quote! {10 #can_be_plcaed_in_vec11 #abi_type12 }13}1415fn impl_can_be_placed_in_vec(ident: &syn::Ident) -> proc_macro2::TokenStream {16 quote! {17 impl ::evm_coder::abi::sealed::CanBePlacedInVec for #ident {}18 }19}2021fn map_field_to_type<'a>(field: &'a syn::Field) -> &'a syn::Type {22 &field.ty23}2425fn impl_abi_type(ast: &syn::DeriveInput) -> proc_macro2::TokenStream {26 let name = &ast.ident;27 let (fields, params_count) = match &ast.data {28 syn::Data::Struct(ds) => match ds.fields {29 syn::Fields::Named(ref fields) => (30 fields.named.iter().map(map_field_to_type),31 fields.named.len(),32 ),33 syn::Fields::Unnamed(ref fields) => (34 fields.unnamed.iter().map(map_field_to_type),35 fields.unnamed.len(),36 ),37 syn::Fields::Unit => unimplemented!("Unit structs not supported"),38 },39 syn::Data::Enum(_) => unimplemented!("Enums not supported"),40 syn::Data::Union(_) => unimplemented!("Unions not supported"),41 };4243 let mut params_signature = {44 let fields = fields.clone();45 quote!(46 #(nameof(<#fields as ::evm_coder::abi::AbiType>::SIGNATURE) fixed(","))*47 )48 };49 if params_count > 0 {50 params_signature.extend(quote!(shift_left(1)))51 };5253 let fields_for_dynamic = fields.clone();5455 quote! {56 impl ::evm_coder::abi::AbiType for #name {57 const SIGNATURE: ::evm_coder::custom_signature::SignatureUnit = ::evm_coder::make_signature!(58 new fixed("(")59 #params_signature60 fixed(")")61 );62 fn is_dynamic() -> bool {63 false64 #(65 || <#fields_for_dynamic as ::evm_coder::abi::AbiType>::is_dynamic()66 )*67 }68 fn size() -> usize {69 0 #(+ <#fields as ::evm_coder::abi::AbiType>::size())*70 }71 }72 }73}crates/evm-coder/procedural/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/procedural/src/lib.rs
+++ b/crates/evm-coder/procedural/src/lib.rs
@@ -247,7 +247,10 @@
#[proc_macro_derive(AbiCoder)]
pub fn abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
let ast = syn::parse(input).unwrap();
- let ts = abi_derive::impl_abi_macro(&ast);
+ let ts = match abi_derive::impl_abi_macro(&ast) {
+ Ok(e) => e,
+ Err(e) => e.to_compile_error(),
+ };
// println!("{}", &ts);
ts.into()
}
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/abi_derive_generation.rs
+++ b/crates/evm-coder/tests/abi_derive_generation.rs
@@ -4,8 +4,9 @@
abi::{AbiType},
};
-#[derive(AbiCoder)]
-struct TypeStructUnit {}
+// TODO: move to build_failed tests
+// #[derive(AbiCoder)]
+// struct TypeStructUnit {}
#[derive(AbiCoder)]
struct TypeStruct1SimpleParam {
@@ -70,10 +71,6 @@
#[test]
fn impl_abi_type_signature() {
assert_eq!(
- <TypeStructUnit as AbiType>::SIGNATURE.as_str().unwrap(),
- "()"
- );
- assert_eq!(
<TypeStruct1SimpleParam as AbiType>::SIGNATURE
.as_str()
.unwrap(),
@@ -137,7 +134,6 @@
#[test]
fn impl_abi_type_is_dynamic() {
- assert_eq!(<TypeStructUnit as AbiType>::is_dynamic(), false);
assert_eq!(<TypeStruct1SimpleParam as AbiType>::is_dynamic(), false);
assert_eq!(<TypeStruct1DynamicParam as AbiType>::is_dynamic(), true);
assert_eq!(<TypeStruct2SimpleParam as AbiType>::is_dynamic(), false);
@@ -168,7 +164,6 @@
#[test]
fn impl_abi_type_size() {
const ABI_ALIGNMENT: usize = 32;
- assert_eq!(<TypeStructUnit as AbiType>::size(), 0);
assert_eq!(<TypeStruct1SimpleParam as AbiType>::size(), ABI_ALIGNMENT);
assert_eq!(<TypeStruct1DynamicParam as AbiType>::size(), ABI_ALIGNMENT);
assert_eq!(