chore: update to rust 2024

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

Author: explodingcamera

Cargo.lock

@@ -4,17 +4,18 @@ default-members=[".", "crates/tinywasm", "crates/types", "crates/parser"]
 resolver="2"
 
 [workspace.dependencies]
-wast="225"
-wat="1.225"
+wast="226"
+wat="1.226"
+wasmparser={version="0.226", default-features=false}
 eyre="0.6"
 log="0.4"
 pretty_env_logger="0.5"
 criterion={version="0.5", default-features=false, features=["cargo_bench_support", "rayon"]}
 
 [workspace.package]
 version="0.9.0-alpha.0"
-rust-version="1.81"
-edition="2021"
+rust-version="1.85"
+edition="2024"
 license="MIT OR Apache-2.0"
 authors=["Henry Gressmann <[email protected]>"]
 repository="https://github.com/explodingcamera/tinywasm"

Cargo.toml

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

crates/parser/Cargo.toml

@@ -92,7 +92,7 @@ pub(crate) fn convert_module_import(import: wasmparser::Import<'_>) -> Result<Im
                 ImportKind::Global(GlobalType { mutable: ty.mutable, ty: convert_valtype(&ty.content_type) })
             }
             wasmparser::TypeRef::Tag(ty) => {
-                return Err(crate::ParseError::UnsupportedOperator(format!("Unsupported import kind: {ty:?}")))
+                return Err(crate::ParseError::UnsupportedOperator(format!("Unsupported import kind: {ty:?}")));
             }
         },
     })
@@ -157,7 +157,7 @@ pub(crate) fn convert_module_export(export: wasmparser::Export<'_>) -> Result<Ex
         wasmparser::ExternalKind::Memory => ExternalKind::Memory,
         wasmparser::ExternalKind::Global => ExternalKind::Global,
         wasmparser::ExternalKind::Tag => {
-            return Err(crate::ParseError::UnsupportedOperator(format!("Unsupported export kind: {:?}", export.kind)))
+            return Err(crate::ParseError::UnsupportedOperator(format!("Unsupported export kind: {:?}", export.kind)));
         }
     };
 

crates/parser/src/conversion.rs

@@ -72,14 +72,12 @@ impl Parser {
             component_model: false,
             component_model_nested_names: false,
             component_model_values: false,
-            component_model_more_flags: false,
             exceptions: false,
             gc: false,
             memory_control: false,
             relaxed_simd: false,
             threads: false,
             shared_everything_threads: false,
-            component_model_multiple_returns: false,
             legacy_exceptions: false,
             component_model_async: false,
         };

crates/parser/src/lib.rs

@@ -1,5 +1,5 @@
 use crate::log::debug;
-use crate::{conversion, ParseError, Result};
+use crate::{ParseError, Result, conversion};
 use alloc::string::ToString;
 use alloc::{boxed::Box, format, vec::Vec};
 use tinywasm_types::{

crates/parser/src/module.rs

@@ -531,11 +531,11 @@ impl<R: WasmModuleResources> wasmparser::VisitSimdOperator<'_> for FunctionBuild
 
     fn visit_i8x16_shuffle(&mut self, lanes: [u8; 16]) -> Self::Output {
         self.v128_constants.push(u128::from_le_bytes(lanes));
-        self.instructions.push(Instruction::I8x16Shuffle(self.v128_constants.len() as u32 - 1).into());
+        self.instructions.push(Instruction::I8x16Shuffle(self.v128_constants.len() as u32 - 1));
     }
 
     fn visit_v128_const(&mut self, value: wasmparser::V128) -> Self::Output {
         self.v128_constants.push(value.i128() as u128);
-        self.instructions.push(Instruction::V128Const(self.v128_constants.len() as u32 - 1).into());
+        self.instructions.push(Instruction::V128Const(self.v128_constants.len() as u32 - 1));
     }
 }

crates/parser/src/visit.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.4.2"}
+wasm-testsuite={version="0.4.4"}
 indexmap="2.7"
 wast={workspace=true}
 wat={workspace=true}

crates/tinywasm/Cargo.toml

@@ -1,6 +1,6 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use eyre::Result;
-use tinywasm::{types, ModuleInstance, Store};
+use tinywasm::{ModuleInstance, Store, types};
 use types::TinyWasmModule;
 
 const WASM: &[u8] = include_bytes!("../../../examples/rust/out/argon2id.opt.wasm");

crates/tinywasm/benches/argon2id.rs

@@ -1,6 +1,6 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use eyre::Result;
-use tinywasm::{types, ModuleInstance, Store};
+use tinywasm::{ModuleInstance, Store, types};
 use types::TinyWasmModule;
 
 const WASM: &[u8] = include_bytes!("../../../examples/rust/out/fibonacci.opt.wasm");
@@ -17,8 +17,7 @@ fn fibonacci_to_twasm(module: &TinyWasmModule) -> Result<Vec<u8>> {
 }
 
 fn fibonacci_from_twasm(twasm: &[u8]) -> Result<TinyWasmModule> {
-    let module = TinyWasmModule::from_twasm(&twasm)?;
-    Ok(module)
+    Ok(TinyWasmModule::from_twasm(twasm)?)
 }
 
 fn fibonacci_run(module: TinyWasmModule, recursive: bool, n: i32) -> Result<()> {