chore: update deps

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -4,8 +4,8 @@ default-members=[".", "crates/tinywasm", "crates/types", "crates/parser"]
 resolver="2"
 
 [workspace.dependencies]
-wast="217"
-wat="1.217"
+wast="218"
+wat="1.218"
 eyre="0.6"
 log="0.4"
 pretty_env_logger="0.5"

Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace=true
 rust-version.workspace=true
 
 [dependencies]
-wasmparser={version="0.217", default-features=false, features=["validate", "features"]}
+wasmparser={version="0.218", default-features=false, features=["validate", "features"]}
 log={workspace=true, optional=true}
 tinywasm-types={version="0.8.0-alpha.0", path="../types", default-features=false}
 

crates/parser/Cargo.toml

@@ -66,6 +66,7 @@ impl Parser {
             custom_page_sizes: true,
 
             gc_types: true,
+            stack_switching: false,
             component_model: false,
             component_model_nested_names: false,
             component_model_values: false,

crates/parser/src/lib.rs

@@ -8,7 +8,7 @@ use wasmparser::{FuncValidator, FuncValidatorAllocations, FunctionBody, VisitOpe
 
 struct ValidateThenVisit<'a, R: WasmModuleResources>(usize, &'a mut FunctionBuilder<R>);
 macro_rules! validate_then_visit {
-    ($( @$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident)*) => {$(
+    ($( @$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident ($($ann:tt)*))*) => {$(
         fn $visit(&mut self $($(,$arg: $argty)*)?) -> Self::Output {
             self.1.$visit($($($arg.clone()),*)?);
             self.1.validator_visitor(self.0).$visit($($($arg),*)?)?;
@@ -118,8 +118,8 @@ impl<R: WasmModuleResources> FunctionBuilder<R> {
 }
 
 macro_rules! impl_visit_operator {
-    ($(@$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident)*) => {
-        $(impl_visit_operator!(@@$proposal $op $({ $($arg: $argty),* })? => $visit);)*
+    ($(@$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident ($($ann:tt)*))*) => {
+        $(impl_visit_operator!(@@$proposal $op $({ $($arg: $argty),* })? => $visit ($($ann:tt)*));)*
     };
 
     (@@mvp $($rest:tt)* ) => {};
@@ -129,15 +129,15 @@ macro_rules! impl_visit_operator {
     (@@bulk_memory $($rest:tt)* ) => {};
     (@@tail_call $($rest:tt)* ) => {};
     // (@@simd $($rest:tt)* ) => {};
-    (@@$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident) => {
+    (@@$proposal:ident $op:ident $({ $($arg:ident: $argty:ty),* })? => $visit:ident ($($ann:tt)*)) => {
         #[cold]
         fn $visit(&mut self $($(,$arg: $argty)*)?) {
             self.unsupported(stringify!($visit))
         }
     };
 }
 
-impl<'a, R: WasmModuleResources> wasmparser::VisitOperator<'a> for FunctionBuilder<R> {
+impl<R: WasmModuleResources> wasmparser::VisitOperator<'_> for FunctionBuilder<R> {
     type Output = ();
     wasmparser::for_each_operator!(impl_visit_operator);
 

crates/parser/src/visit.rs

@@ -1,5 +1,6 @@
 pub(crate) mod executor;
 pub(crate) mod num_helpers;
+// pub(crate) mod simd;
 pub(crate) mod stack;
 mod values;
 

crates/tinywasm/src/interpreter/mod.rs

@@ -16,14 +16,14 @@ pub struct MemoryRef<'a>(pub(crate) &'a MemoryInstance);
 #[derive(Debug)]
 pub struct MemoryRefMut<'a>(pub(crate) &'a mut MemoryInstance);
 
-impl<'a> MemoryRefLoad for MemoryRef<'a> {
+impl MemoryRefLoad for MemoryRef<'_> {
     /// Load a slice of memory
     fn load(&self, offset: usize, len: usize) -> Result<&[u8]> {
         self.0.load(offset, len)
     }
 }
 
-impl<'a> MemoryRefLoad for MemoryRefMut<'a> {
+impl MemoryRefLoad for MemoryRefMut<'_> {
     /// Load a slice of memory
     fn load(&self, offset: usize, len: usize) -> Result<&[u8]> {
         self.0.load(offset, len)

crates/tinywasm/src/reference.rs

@@ -49,7 +49,7 @@ impl TableInstance {
 
     pub(crate) fn get(&self, addr: TableAddr) -> Result<&TableElement> {
         // self.elements.get(addr as usize).ok_or_else(|| Error::Trap(Trap::UndefinedElement { index: addr as usize }))
-        self.elements.get(addr as usize).ok_or_else(|| {
+        self.elements.get(addr as usize).ok_or({
             Error::Trap(Trap::TableOutOfBounds { offset: addr as usize, len: 1, max: self.elements.len() })
         })
     }
@@ -135,7 +135,7 @@ impl TableInstance {
 
     pub(crate) fn init(&mut self, offset: i32, init: &[TableElement]) -> Result<()> {
         let offset = offset as usize;
-        let end = offset.checked_add(init.len()).ok_or_else(|| {
+        let end = offset.checked_add(init.len()).ok_or({
             Error::Trap(crate::Trap::TableOutOfBounds { offset, len: init.len(), max: self.elements.len() })
         })?;