chore: cleanup

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

Author: explodingcamera

Cargo.toml

@@ -19,6 +19,8 @@ edition="2024"
 license="MIT OR Apache-2.0"
 authors=["Henry Gressmann <[email protected]>"]
 repository="https://github.com/explodingcamera/tinywasm"
+categories=["wasm", "no-std"]
+keywords=["tinywasm"]
 
 [package]
 name="tinywasm-root"

crates/cli/Cargo.toml

@@ -7,6 +7,8 @@ license.workspace=true
 authors.workspace=true
 repository.workspace=true
 rust-version.workspace=true
+keywords.workspace=true
+categories=["wasm"]
 
 [[bin]]
 name="tinywasm-cli"

crates/parser/Cargo.toml

@@ -7,6 +7,8 @@ license.workspace=true
 authors.workspace=true
 repository.workspace=true
 rust-version.workspace=true
+keywords.workspace=true
+categories.workspace=true
 
 [dependencies]
 wasmparser={workspace=true, features=["validate", "features", "simd"]}

crates/parser/src/module.rs

@@ -30,7 +30,7 @@ pub(crate) struct ModuleReader {
 }
 
 impl ModuleReader {
-    pub(crate) fn new() -> ModuleReader {
+    pub(crate) fn new() -> Self {
         Self::default()
     }
 

crates/parser/src/visit.rs

@@ -370,17 +370,13 @@ impl<'a, R: WasmModuleResources> wasmparser::VisitOperator<'a> for FunctionBuild
 
                 let if_instruction = &mut self.instructions[if_label_pointer];
 
-                let (else_offset, end_offset) = match if_instruction {
-                    Instruction::If(else_offset, end_offset)
-                    | Instruction::IfWithFuncType(_, else_offset, end_offset)
-                    | Instruction::IfWithType(_, else_offset, end_offset) => (else_offset, end_offset),
-                    _ => {
-                        self.errors.push(crate::ParseError::UnsupportedOperator(
-                            "Expected to end an if block, but the last label was not an if".to_string(),
-                        ));
-
-                        return;
-                    }
+                let (Instruction::If(else_offset, end_offset)
+                | Instruction::IfWithFuncType(_, else_offset, end_offset)
+                | Instruction::IfWithType(_, else_offset, end_offset)) = if_instruction
+                else {
+                    return self.errors.push(crate::ParseError::UnsupportedOperator(
+                        "Expected to end an if block, but the last label was not an if".to_string(),
+                    ));
                 };
 
                 *else_offset = (label_pointer - if_label_pointer)

crates/tinywasm/Cargo.toml

@@ -7,6 +7,8 @@ license.workspace=true
 authors.workspace=true
 repository.workspace=true
 rust-version.workspace=true
+keywords.workspace=true
+categories.workspace=true
 readme="../../README.md"
 
 [lib]
@@ -32,7 +34,7 @@ serde_json={version="1.0"}
 serde={version="1.0", features=["derive"]}
 
 [features]
-default=["std", "parser", "logging", "archive", "canonicalize_nans"]
+default=["std", "parser", "logging", "archive", "canonicalize_nans", "__simd"]
 
 logging=["log", "tinywasm-parser?/logging", "tinywasm-types/logging"]
 std=["tinywasm-parser?/std", "tinywasm-types/std"]

crates/tinywasm/src/error.rs

@@ -51,6 +51,7 @@ pub enum Error {
 
 #[derive(Debug)]
 /// Errors that can occur when linking a WebAssembly module
+#[non_exhaustive]
 pub enum LinkingError {
     /// An unknown import was encountered
     UnknownImport {
@@ -83,6 +84,7 @@ impl LinkingError {
 /// A WebAssembly trap
 ///
 /// See <https://webassembly.github.io/spec/core/intro/overview.html#trap>
+#[non_exhaustive]
 pub enum Trap {
     /// An unreachable instruction was executed
     Unreachable,

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};
 
@@ -38,11 +38,11 @@ impl FuncHandle {
 
         // 5. For each value type and the corresponding value, check if types match
         if !(func_ty.params.iter().zip(params).enumerate().all(|(_i, (ty, param))| {
-            if ty != &param.val_type() {
+            if ty == &param.val_type() {
+                true
+            } else {
                 log::error!("param type mismatch at index {_i}: expected {ty:?}, got {param:?}");
                 false
-            } else {
-                true
             }
         })) {
             return Err(Error::Other("Type mismatch".into()));

crates/tinywasm/src/imports.rs

@@ -170,7 +170,7 @@ impl Extern {
         let inner_func = move |ctx: FuncContext<'_>, args: &[WasmValue]| -> Result<Vec<WasmValue>> {
             let args = P::from_wasm_value_tuple(args)?;
             let result = func(ctx, args)?;
-            Ok(result.into_wasm_value_tuple().to_vec())
+            Ok(result.into_wasm_value_tuple())
         };
 
         let ty = tinywasm_types::FuncType { params: P::val_types(), results: R::val_types() };
@@ -263,7 +263,7 @@ impl ResolvedImports {
 impl Imports {
     /// Create a new empty import set
     pub fn new() -> Self {
-        Imports { values: BTreeMap::new(), modules: BTreeMap::new() }
+        Self { values: BTreeMap::new(), modules: BTreeMap::new() }
     }
 
     /// Merge two import sets

crates/tinywasm/src/instance.rs

@@ -12,7 +12,7 @@ use crate::{Error, FuncHandle, FuncHandleTyped, Imports, MemoryRef, MemoryRefMut
 #[derive(Debug, Clone)]
 pub struct ModuleInstance(pub(crate) Rc<ModuleInstanceInner>);
 
-#[allow(dead_code)]
+#[expect(dead_code)]
 #[derive(Debug)]
 pub(crate) struct ModuleInstanceInner {
     pub(crate) failed_to_instantiate: bool,
@@ -90,7 +90,7 @@ impl ModuleInstance {
             exports: module.0.exports,
         };
 
-        let instance = ModuleInstance::new(instance);
+        let instance = Self::new(instance);
         store.add_instance(instance.clone());
 
         match (elem_trapped, data_trapped) {