Remove paste dependency (#1266)

* remove paste dependency * unsilence many warnings
wasmi-labs · Oct 29, 2024 · 29723a1 · 29723a1
1 parent ef5cdf4
commit 29723a1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -17,7 +17,6 @@ exclude.workspace = true
 libm = "0.2.8"
 num-traits = { workspace = true }
 downcast-rs = { version = "1.2", default-features = false }
-paste = "1"
 
 [dev-dependencies]
 rand = "0.8.5"

diff --git a/crates/core/src/untyped.rs b/crates/core/src/untyped.rs
@@ -17,7 +17,6 @@ use core::{
     fmt::{self, Display},
     ops::{Neg, Shl, Shr},
 };
-use paste::paste;
 
 /// An untyped value.
 ///
@@ -1479,27 +1478,25 @@ where
 
 macro_rules! impl_encode_untyped_slice {
     ( $n:literal $( $tuple:ident )* ) => {
-        paste! {
-            impl<$($tuple),*> EncodeUntypedSlice for ($($tuple,)*)
-            where
+        impl<$($tuple),*> EncodeUntypedSlice for ($($tuple,)*)
+        where
+            $(
+                $tuple: Into<UntypedVal>
+            ),*
+        {
+            #[allow(non_snake_case)]
+            #[inline]
+            fn encode_untyped_slice<'a>(self, results: &'a mut [UntypedVal]) -> Result<(), UntypedError> {
+                let Ok(_results) = <&'a mut [UntypedVal; $n]>::try_from(results) else {
+                    return Err(UntypedError::invalid_len())
+                };
+                let ( $( $tuple ,)* ) = self;
+                let mut _i = 0;
                 $(
-                    $tuple: Into<UntypedVal>
-                ),*
-            {
-                #[allow(non_snake_case)]
-                #[inline]
-                fn encode_untyped_slice(self, results: &mut [UntypedVal]) -> Result<(), UntypedError> {
-                    match results {
-                        [ $( [< _results_ $tuple >] ,)* ] => {
-                            let ( $( [< _self_ $tuple >] ,)* ) = self;
-                            $(
-                                *[< _results_ $tuple >] = <$tuple as Into<UntypedVal>>::into([< _self_ $tuple >]);
-                            )*
-                            Ok(())
-                        }
-                        _ => Err(UntypedError::invalid_len())
-                    }
-                }
+                    _results[_i] = <$tuple as Into<UntypedVal>>::into($tuple);
+                    _i += 1;
+                )*
+                Ok(())
             }
         }
     };