chore: update deps, cargo fmt

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

Author: explodingcamera

Cargo.lock

@@ -4,9 +4,9 @@ default-members=[".", "crates/tinywasm", "crates/types", "crates/parser"]
 resolver="2"
 
 [workspace.dependencies]
-wast="227"
-wat="1.227"
-wasmparser={version="0.227", default-features=false}
+wast="228"
+wat="1.228"
+wasmparser={version="0.228", default-features=false}
 eyre="0.6"
 log="0.4"
 pretty_env_logger="0.5"

Cargo.toml

@@ -4,7 +4,7 @@ use argh::FromArgs;
 use args::WasmArg;
 use eyre::Result;
 use log::{debug, info};
-use tinywasm::{types::WasmValue, Module};
+use tinywasm::{Module, types::WasmValue};
 
 use crate::args::to_wasm_args;
 mod args;

crates/cli/src/bin.rs

@@ -1,6 +1,6 @@
 use wast::{
-    parser::{self, ParseBuffer},
     Wat,
+    parser::{self, ParseBuffer},
 };
 
 pub fn wat2wasm(wat: &str) -> Vec<u8> {

crates/cli/src/wat.rs

@@ -70,16 +70,18 @@ impl Parser {
             gc_types: true,
             stack_switching: false,
             component_model: false,
-            component_model_nested_names: false,
-            component_model_values: false,
             exceptions: false,
             gc: false,
             memory_control: false,
             relaxed_simd: false,
             threads: false,
             shared_everything_threads: false,
             legacy_exceptions: false,
-            component_model_async: false,
+            cm_async: false,
+            cm_async_builtins: false,
+            cm_async_stackful: false,
+            cm_nested_names: false,
+            cm_values: false,
         };
         Validator::new_with_features(features.into())
     }

crates/parser/src/lib.rs

@@ -20,7 +20,7 @@ tinywasm-types={version="0.9.0-alpha.0", path="../types", default-features=false
 libm={version="0.2", default-features=false}
 
 [dev-dependencies]
-wasm-testsuite={version="0.5.0"}
+wasm-testsuite={version="0.5.2"}
 indexmap="2.7"
 wast={workspace=true}
 wat={workspace=true}

crates/tinywasm/Cargo.toml

@@ -440,12 +440,12 @@ impl<'store, 'stack> Executor<'store, 'stack> {
 
             I8x16Shl => self.stack.values.calculate_diff::<i32, i8x16, i8x16>(|a, b| Ok(b.shl(a as i8))).to_cf()?,
             I16x8Shl => self.stack.values.calculate_diff::<i32, i16x8, i16x8>(|a, b| Ok(b.shl(a as i16))).to_cf()?,
-            I32x4Shl => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shl(a as i32))).to_cf()?,
+            I32x4Shl => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shl(a))).to_cf()?,
             I64x2Shl => self.stack.values.calculate_diff::<i32, i64x2, i64x2>(|a, b| Ok(b.shl(a as i64))).to_cf()?,
 
             I8x16ShrS => self.stack.values.calculate_diff::<i32, i8x16, i8x16>(|a, b| Ok(b.shr(a as i8))).to_cf()?,
             I16x8ShrS => self.stack.values.calculate_diff::<i32, i16x8, i16x8>(|a, b| Ok(b.shr(a as i16))).to_cf()?,
-            I32x4ShrS => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shr(a as i32))).to_cf()?,
+            I32x4ShrS => self.stack.values.calculate_diff::<i32, i32x4, i32x4>(|a, b| Ok(b.shr(a))).to_cf()?,
             I64x2ShrS => self.stack.values.calculate_diff::<i32, i64x2, i64x2>(|a, b| Ok(b.shr(a as i64))).to_cf()?,
 
             I8x16ShrU => self.stack.values.calculate_diff::<i32, u8x16, u8x16>(|a, b| Ok(b.shr(a as u8))).to_cf()?,

crates/tinywasm/src/interpreter/executor.rs

@@ -1,8 +1,8 @@
 use eyre::Result;
 use std::fmt::Write;
 use tinywasm::{
-    types::{FuncType, ValType, WasmValue},
     Extern, FuncContext, Imports, Module, Store,
+    types::{FuncType, ValType, WasmValue},
 };
 use tinywasm_types::ExternRef;
 

crates/tinywasm/tests/host_func_signature_check.rs

@@ -1,7 +1,7 @@
 mod testsuite;
 use eyre::Result;
 use testsuite::TestSuite;
-use wasm_testsuite::data::{spec, SpecVersion};
+use wasm_testsuite::data::{SpecVersion, spec};
 
 fn main() -> Result<()> {
     TestSuite::set_log_level(log::LevelFilter::Off);