summaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/parser/Cargo.toml2
-rw-r--r--crates/parser/src/conversion.rs4
-rw-r--r--crates/parser/src/lib.rs2
-rw-r--r--crates/parser/src/module.rs2
-rw-r--r--crates/parser/src/visit.rs4
-rw-r--r--crates/tinywasm/Cargo.toml2
-rw-r--r--crates/tinywasm/benches/argon2id.rs4
-rw-r--r--crates/tinywasm/benches/fibonacci.rs7
-rw-r--r--crates/tinywasm/benches/tinywasm.rs6
-rw-r--r--crates/tinywasm/src/error.rs2
-rw-r--r--crates/tinywasm/src/func.rs2
-rw-r--r--crates/tinywasm/src/imports.rs6
-rw-r--r--crates/tinywasm/src/interpreter/stack/call_stack.rs4
-rw-r--r--crates/tinywasm/src/interpreter/stack/value_stack.rs2
-rw-r--r--crates/tinywasm/src/store/memory.rs2
-rw-r--r--crates/tinywasm/src/store/mod.rs2
-rw-r--r--crates/types/src/archive.rs4
17 files changed, 27 insertions, 30 deletions
diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
index fec21b3..7bd9cad 100644
--- a/crates/parser/Cargo.toml
+++ b/crates/parser/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}
diff --git a/crates/parser/src/conversion.rs b/crates/parser/src/conversion.rs
index 273dd44..86548d6 100644
--- a/crates/parser/src/conversion.rs
+++ b/crates/parser/src/conversion.rs
@@ -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)));
}
};
diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index 04da9da..e5022c5 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.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,
};
diff --git a/crates/parser/src/module.rs b/crates/parser/src/module.rs
index 9b31f9e..ff6b22b 100644
--- a/crates/parser/src/module.rs
+++ b/crates/parser/src/module.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::{
diff --git a/crates/parser/src/visit.rs b/crates/parser/src/visit.rs
index 89c27d1..2830d3a 100644
--- a/crates/parser/src/visit.rs
+++ b/crates/parser/src/visit.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));
}
}
diff --git a/crates/tinywasm/Cargo.toml b/crates/tinywasm/Cargo.toml
index 0623f35..2cad2e4 100644
--- a/crates/tinywasm/Cargo.toml
+++ b/crates/tinywasm/Cargo.toml
@@ -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}
diff --git a/crates/tinywasm/benches/argon2id.rs b/crates/tinywasm/benches/argon2id.rs
index d977352..aa8b38b 100644
--- a/crates/tinywasm/benches/argon2id.rs
+++ b/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/argon2id.opt.wasm");
diff --git a/crates/tinywasm/benches/fibonacci.rs b/crates/tinywasm/benches/fibonacci.rs
index dcf6eb9..a5f1c72 100644
--- a/crates/tinywasm/benches/fibonacci.rs
+++ b/crates/tinywasm/benches/fibonacci.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<()> {
diff --git a/crates/tinywasm/benches/tinywasm.rs b/crates/tinywasm/benches/tinywasm.rs
index 8552d6c..4848a4a 100644
--- a/crates/tinywasm/benches/tinywasm.rs
+++ b/crates/tinywasm/benches/tinywasm.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, Extern, FuncContext, Imports, ModuleInstance, Store};
+use tinywasm::{Extern, FuncContext, Imports, ModuleInstance, Store, types};
use types::TinyWasmModule;
const WASM: &[u8] = include_bytes!("../../../examples/rust/out/tinywasm.opt.wasm");
@@ -17,7 +17,7 @@ fn tinywasm_to_twasm(module: &TinyWasmModule) -> Result<Vec<u8>> {
}
fn tinywasm_from_twasm(twasm: &[u8]) -> Result<TinyWasmModule> {
- let module = TinyWasmModule::from_twasm(&twasm)?;
+ let module = TinyWasmModule::from_twasm(twasm)?;
Ok(module)
}
diff --git a/crates/tinywasm/src/error.rs b/crates/tinywasm/src/error.rs
index 1d488d8..9637521 100644
--- a/crates/tinywasm/src/error.rs
+++ b/crates/tinywasm/src/error.rs
@@ -1,8 +1,8 @@
use alloc::string::{String, ToString};
use alloc::vec::Vec;
use core::{fmt::Display, ops::ControlFlow};
-use tinywasm_types::archive::TwasmError;
use tinywasm_types::FuncType;
+use tinywasm_types::archive::TwasmError;
#[cfg(feature = "parser")]
pub use tinywasm_parser::ParseError;
diff --git a/crates/tinywasm/src/func.rs b/crates/tinywasm/src/func.rs
index f5a9873..2eeabca 100644
--- a/crates/tinywasm/src/func.rs
+++ b/crates/tinywasm/src/func.rs
@@ -1,6 +1,6 @@
use crate::interpreter::stack::{CallFrame, Stack};
-use crate::{log, unlikely, Function};
use crate::{Error, FuncContext, Result, Store};
+use crate::{Function, log, unlikely};
use alloc::{boxed::Box, format, string::String, string::ToString, vec, vec::Vec};
use tinywasm_types::{ExternRef, FuncRef, FuncType, ModuleInstanceAddr, ValType, WasmValue};
diff --git a/crates/tinywasm/src/imports.rs b/crates/tinywasm/src/imports.rs
index 0797470..12876c8 100644
--- a/crates/tinywasm/src/imports.rs
+++ b/crates/tinywasm/src/imports.rs
@@ -6,7 +6,7 @@ use alloc::vec::Vec;
use core::fmt::Debug;
use crate::func::{FromWasmValueTuple, IntoWasmValueTuple, ValTypesFromTuple};
-use crate::{log, LinkingError, MemoryRef, MemoryRefMut, Result};
+use crate::{LinkingError, MemoryRef, MemoryRefMut, Result, log};
use tinywasm_types::*;
/// The internal representation of a function
@@ -322,7 +322,7 @@ impl Imports {
match (expected.size_max, actual.size_max) {
(None, Some(_)) => return Err(LinkingError::incompatible_import_type(import).into()),
(Some(expected_max), Some(actual_max)) if actual_max < expected_max => {
- return Err(LinkingError::incompatible_import_type(import).into())
+ return Err(LinkingError::incompatible_import_type(import).into());
}
_ => {}
}
@@ -339,7 +339,7 @@ impl Imports {
Self::compare_types(import, &expected.arch(), &actual.arch())?;
if actual.page_count_initial() > expected.page_count_initial()
- && real_size.map_or(true, |size| actual.page_count_initial() > size as u64)
+ && real_size.is_none_or(|size| actual.page_count_initial() > size as u64)
{
return Err(LinkingError::incompatible_import_type(import).into());
}
diff --git a/crates/tinywasm/src/interpreter/stack/call_stack.rs b/crates/tinywasm/src/interpreter/stack/call_stack.rs
index f0e8d18..9b6c3fd 100644
--- a/crates/tinywasm/src/interpreter/stack/call_stack.rs
+++ b/crates/tinywasm/src/interpreter/stack/call_stack.rs
@@ -1,9 +1,9 @@
use core::ops::ControlFlow;
use super::BlockType;
-use crate::interpreter::values::*;
use crate::Trap;
-use crate::{unlikely, Error};
+use crate::interpreter::values::*;
+use crate::{Error, unlikely};
use alloc::boxed::Box;
use alloc::{rc::Rc, vec, vec::Vec};
diff --git a/crates/tinywasm/src/interpreter/stack/value_stack.rs b/crates/tinywasm/src/interpreter/stack/value_stack.rs
index ea6a082..9830c01 100644
--- a/crates/tinywasm/src/interpreter/stack/value_stack.rs
+++ b/crates/tinywasm/src/interpreter/stack/value_stack.rs
@@ -1,7 +1,7 @@
use alloc::vec::Vec;
use tinywasm_types::{ExternRef, FuncRef, ValType, ValueCounts, ValueCountsSmall, WasmValue};
-use crate::{interpreter::*, Result};
+use crate::{Result, interpreter::*};
use super::Locals;
pub(crate) const STACK_32_SIZE: usize = 1024 * 32;
diff --git a/crates/tinywasm/src/store/memory.rs b/crates/tinywasm/src/store/memory.rs
index 4826b65..d204c67 100644
--- a/crates/tinywasm/src/store/memory.rs
+++ b/crates/tinywasm/src/store/memory.rs
@@ -2,7 +2,7 @@ use alloc::vec;
use alloc::vec::Vec;
use tinywasm_types::{MemoryType, ModuleInstanceAddr};
-use crate::{cold, log, Error, Result};
+use crate::{Error, Result, cold, log};
/// A WebAssembly Memory Instance
///
diff --git a/crates/tinywasm/src/store/mod.rs b/crates/tinywasm/src/store/mod.rs
index 86cbb5d..5730631 100644
--- a/crates/tinywasm/src/store/mod.rs
+++ b/crates/tinywasm/src/store/mod.rs
@@ -4,7 +4,7 @@ use core::sync::atomic::{AtomicUsize, Ordering};
use tinywasm_types::*;
use crate::interpreter::{self, InterpreterRuntime, TinyWasmValue};
-use crate::{cold, Error, Function, ModuleInstance, Result, Trap};
+use crate::{Error, Function, ModuleInstance, Result, Trap, cold};
mod data;
mod element;
diff --git a/crates/types/src/archive.rs b/crates/types/src/archive.rs
index a725e3d..cbc22ad 100644
--- a/crates/types/src/archive.rs
+++ b/crates/types/src/archive.rs
@@ -52,13 +52,13 @@ impl TinyWasmModule {
pub fn from_twasm(wasm: &[u8]) -> Result<TinyWasmModule, TwasmError> {
let len = validate_magic(wasm)?;
- postcard::from_bytes(&wasm[len..]).map_err(|e| TwasmError::InvalidArchive(e))
+ postcard::from_bytes(&wasm[len..]).map_err(TwasmError::InvalidArchive)
}
/// Serializes the `TinyWasmModule` into a vector of bytes.
pub fn serialize_twasm(&self) -> Result<Vec<u8>, TwasmError> {
let buf = Vec::from(TWASM_MAGIC);
- postcard::to_extend(self, buf).map_err(|e| TwasmError::InvalidArchive(e))
+ postcard::to_extend(self, buf).map_err(TwasmError::InvalidArchive)
}
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-03 18:07:00 +0000