Cleanup

Author: OpenByteDev

src/abi_value.rs

@@ -200,15 +200,12 @@ macro_rules! abi_kind_impl {
 
 abi_kind_impl!(AbiValue => {
     Rust => "Rust",
-
     C { unwind: false } => "C",
     C { unwind: true } => "C-unwind",
     System { unwind: false } => "system",
     System { unwind: true } => "system-unwind",
-
     Aapcs { unwind: false } => "aapcs",
     Aapcs { unwind: true } => "aapcs-unwind",
-
     Cdecl { unwind: false } => "cdecl",
     Cdecl { unwind: true } => "cdecl-unwind",
     Stdcall { unwind: false } => "stdcall",
@@ -219,7 +216,6 @@ abi_kind_impl!(AbiValue => {
     Thiscall { unwind: true } => "thiscall-unwind",
     Vectorcall { unwind: false } => "vectorcall",
     Vectorcall { unwind: true } => "vectorcall-unwind",
-
     SysV64 { unwind: false } => "sysv64",
     SysV64 { unwind: true } => "sysv64-unwind",
     Win64 { unwind: false } => "win64",

src/base.rs

@@ -211,3 +211,4 @@ pub trait UnsafeFnPtr: FnPtr<Safety = Unsafe> {
 /// Marker trait for all *static* function pointer types.
 /// The return type and all parameter types have to be `'static`.
 pub trait StaticFnPtr: FnPtr + 'static {}
+impl<F: FnPtr + 'static> StaticFnPtr for F {}

src/impl.rs

@@ -97,20 +97,9 @@ macro_rules! impl_fn {
         }
         impl_fn!(@impl_safe_fn_type ($($nm : $ty),*), $fn_type, $safety);
 
-        #[automatically_derived]
-        impl<Output: 'static, $($ty: 'static),*> $crate::StaticFnPtr for $fn_type {
-        }
-
         #[automatically_derived]
         impl<Output, $($ty),*> $crate::BuildFn<$crate::safety!($safety), $crate::abi::$abi_ident, Output> for ($($ty,)*) {
-            type F = impl_fn!(@make_unsafe extern $call_conv fn($($ty),*) -> Output, $safety);
-        }
-    };
-
-    (@impl_withabi ($($nm:ident : $ty:ident),*), $fn_type:ty, $safety:tt, $abi:tt) => {
-        #[automatically_derived]
-        impl<Output, $($ty),*> $crate::WithAbi<$crate::abi!($abi)> for $fn_type {
-            type F = impl_fn!(@make_unsafe extern $abi fn($($ty),*) -> Output, $safety);
+                type F = impl_fn!(@make_unsafe extern $call_conv fn($($ty),*) -> Output, $safety);
         }
     };
 
@@ -122,22 +111,19 @@ macro_rules! impl_fn {
     (@impl_safe_fn_type ($($nm:ident : $ty:ident),*), $fn_type:ty, true) => {
         #[automatically_derived]
         impl<Output, $($ty),*> $crate::SafeFnPtr for $fn_type {
-            fn invoke(&self, impl_fn!(@call_args ($($nm),*)): Self::Args) -> Self::Output {
+            fn invoke(&self, ($($nm,)*): Self::Args) -> Self::Output {
                 (*self)($($nm),*)
             }
         }
     };
     (@impl_safe_fn_type ($($nm:ident : $ty:ident),*), $fn_type:ty, false) => {
         #[automatically_derived]
         impl<Output, $($ty),*> $crate::UnsafeFnPtr for $fn_type {
-            unsafe fn invoke(&self, impl_fn!(@call_args ($($nm),*)): Self::Args) -> Self::Output {
+            unsafe fn invoke(&self, ($($nm,)*): Self::Args) -> Self::Output {
                 unsafe { (*self)($($nm),*) }
             }
         }
     };
-
-    (@call_args ($single:ident)) => { ($single,) };
-    (@call_args ($($args:ident),*)) => { ($($args),*) };
 }
 
 // Default: generate impls up to 6 arguments