chore: update deps, cleanup

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

Author: explodingcamera

Cargo.lock

@@ -37,7 +37,3 @@ opt-level=3
 lto="thin"
 codegen-units=1
 debug=true
-
-[patch.crates-io]
-# https://github.com/servo/pathfinder/pull/548 & https://github.com/servo/pathfinder/issues/558
-pathfinder_simd={git="https://github.com/servo/pathfinder", rev="30419d07660dc11a21e42ef4a7fa329600cff152"}

Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace=true
 criterion={version="0.5", features=["html_reports"]}
 tinywasm={path="../crates/tinywasm"}
 wat={version="1"}
-wasmi={version="0.31", features=["std"]}
+wasmi={version="0.32", features=["std"]}
 wasmer={version="4.3", features=["cranelift", "singlepass"]}
 argon2={version="0.5"}
 

benchmarks/Cargo.toml

@@ -92,7 +92,7 @@ impl Parser {
             return Err(ParseError::EndNotReached);
         }
 
-        reader.to_module()
+        reader.into_module()
     }
 
     #[cfg(feature = "std")]
@@ -132,7 +132,7 @@ impl Parser {
                     reader.process_payload(payload, &mut validator)?;
                     buffer.drain(..consumed);
                     if eof || reader.end_reached {
-                        return reader.to_module();
+                        return reader.into_module();
                     }
                 }
             };
@@ -144,6 +144,6 @@ impl TryFrom<ModuleReader> for TinyWasmModule {
     type Error = ParseError;
 
     fn try_from(reader: ModuleReader) -> Result<Self> {
-        reader.to_module()
+        reader.into_module()
     }
 }

crates/parser/src/lib.rs

@@ -179,14 +179,12 @@ impl ModuleReader {
     }
 
     #[inline]
-    pub(crate) fn to_module(self) -> Result<TinyWasmModule> {
+    pub(crate) fn into_module(self) -> Result<TinyWasmModule> {
         if !self.end_reached {
             return Err(ParseError::EndNotReached);
         }
 
-        let local_function_count = self.code.len();
-
-        if self.code_type_addrs.len() != local_function_count {
+        if self.code_type_addrs.len() != self.code.len() {
             return Err(ParseError::Other("Code and code type address count mismatch".to_string()));
         }
 
@@ -199,13 +197,14 @@ impl ModuleReader {
                 locals,
                 ty: self.func_types.get(ty_idx as usize).expect("No func type for func, this is a bug").clone(),
             })
-            .collect::<Vec<_>>();
+            .collect::<Vec<_>>()
+            .into_boxed_slice();
 
         let globals = self.globals;
         let table_types = self.table_types;
 
         Ok(TinyWasmModule {
-            funcs: funcs.into_boxed_slice(),
+            funcs,
             func_types: self.func_types.into_boxed_slice(),
             globals: globals.into_boxed_slice(),
             table_types: table_types.into_boxed_slice(),

crates/parser/src/module.rs

@@ -1,14 +1,16 @@
 use crate::{cold, unlikely, Error, Result};
 use alloc::vec::Vec;
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub(crate) struct BlockStack(Vec<BlockFrame>);
 
-impl BlockStack {
-    pub(crate) fn new() -> Self {
+impl Default for BlockStack {
+    fn default() -> Self {
         Self(Vec::with_capacity(128))
     }
+}
 
+impl BlockStack {
     #[inline(always)]
     pub(crate) fn len(&self) -> usize {
         self.0.len()
@@ -50,7 +52,7 @@ impl BlockStack {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug)]
 pub(crate) struct BlockFrame {
     pub(crate) instr_ptr: usize, // position of the instruction pointer when the block was entered
     pub(crate) end_instr_offset: u32, // position of the end instruction of the block
@@ -69,10 +71,7 @@ pub(crate) struct BlockFrame {
     pub(crate) ty: BlockType,
 }
 
-impl BlockFrame {}
-
-#[derive(Debug, Copy, Clone)]
-#[allow(dead_code)]
+#[derive(Debug)]
 pub(crate) enum BlockType {
     Loop,
     If,

crates/tinywasm/src/runtime/stack/block_stack.rs

@@ -37,7 +37,7 @@ impl CallStack {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub(crate) struct CallFrame {
     pub(crate) instr_ptr: usize,
     pub(crate) block_ptr: u32,

crates/tinywasm/src/runtime/stack/call_stack.rs

@@ -16,6 +16,6 @@ pub(crate) struct Stack {
 
 impl Stack {
     pub(crate) fn new(call_frame: CallFrame) -> Self {
-        Self { values: ValueStack::default(), blocks: BlockStack::new(), call_stack: CallStack::new(call_frame) }
+        Self { values: ValueStack::default(), blocks: BlockStack::default(), call_stack: CallStack::new(call_frame) }
     }
 }

crates/tinywasm/src/runtime/stack/mod.rs

@@ -68,7 +68,6 @@ impl ValueStack {
             self.stack.end >= 2 && self.stack.end <= self.stack.data.len(),
             "invalid stack state (should be impossible)"
         );
-
         self.stack.data[self.stack.end - 2] =
             func(self.stack.data[self.stack.end - 2], self.stack.data[self.stack.end - 1]);
 

crates/tinywasm/src/runtime/stack/value_stack.rs

@@ -307,7 +307,7 @@ pub enum ElementKind {
     Declared,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 #[cfg_attr(feature = "archive", derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize), archive(check_bytes))]
 pub enum ElementItem {
     Func(FuncAddr),