chore: cleanup clippy errors

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

Author: explodingcamera

Cargo.lock

@@ -2,12 +2,12 @@ use super::{DefaultRuntime, Stack};
 use crate::{
     get_label_args,
     log::debug,
-    runtime::{BlockType, LabelFrame, RawWasmValue},
+    runtime::{BlockType, LabelFrame},
     CallFrame, Error, ModuleInstance, Result, Store,
 };
 use alloc::vec::Vec;
 use log::info;
-use tinywasm_types::{BlockArgs, FuncType, Instruction, ValType};
+use tinywasm_types::Instruction;
 
 mod macros;
 use macros::*;
@@ -143,7 +143,7 @@ fn exec_one(
                         instr_ptr: cf.instr_ptr,
                         end_instr_ptr: cf.instr_ptr + *end_offset,
                         stack_ptr: stack.values.len(), // - params,
-                        args: get_label_args(*args, &module)?,
+                        args: get_label_args(*args, module)?,
                         ty: BlockType::If,
                     },
                     &mut stack.values,
@@ -158,7 +158,7 @@ fn exec_one(
                     instr_ptr: cf.instr_ptr,
                     end_instr_ptr: cf.instr_ptr + *end_offset,
                     stack_ptr: stack.values.len(), // - params,
-                    args: get_label_args(*args, &module)?,
+                    args: get_label_args(*args, module)?,
                     ty: BlockType::Loop,
                 },
                 &mut stack.values,
@@ -172,7 +172,7 @@ fn exec_one(
                     instr_ptr: cf.instr_ptr,
                     end_instr_ptr: cf.instr_ptr + *end_offset,
                     stack_ptr: stack.values.len(), //- params,
-                    args: get_label_args(*args, &module)?,
+                    args: get_label_args(*args, module)?,
                     ty: BlockType::Block,
                 },
                 &mut stack.values,
@@ -195,10 +195,10 @@ fn exec_one(
             todo!()
         }
 
-        Br(v) => cf.break_to(*v, &mut stack.values, module)?,
+        Br(v) => cf.break_to(*v, &mut stack.values)?,
         BrIf(v) => {
             if stack.values.pop_t::<i32>()? > 0 {
-                cf.break_to(*v, &mut stack.values, module)?
+                cf.break_to(*v, &mut stack.values)?
             };
         }
 

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

@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 use log::info;
-use tinywasm_types::{BlockArgs, FuncType};
+use tinywasm_types::BlockArgs;
 
 use crate::{ModuleInstance, Result};
 
@@ -65,15 +65,15 @@ pub(crate) enum BlockType {
 }
 
 #[derive(Debug, Clone)]
-pub struct LabelArgs {
-    pub params: usize,
-    pub results: usize,
+pub(crate) struct LabelArgs {
+    pub(crate) params: usize,
+    pub(crate) results: usize,
 }
 
-pub fn get_label_args(args: BlockArgs, module: &ModuleInstance) -> Result<LabelArgs> {
+pub(crate) fn get_label_args(args: BlockArgs, module: &ModuleInstance) -> Result<LabelArgs> {
     Ok(match args {
         BlockArgs::Empty => LabelArgs { params: 0, results: 0 },
-        BlockArgs::Type(t) => LabelArgs { params: 0, results: 1 },
+        BlockArgs::Type(_) => LabelArgs { params: 0, results: 1 },
         BlockArgs::FuncType(t) => LabelArgs {
             params: module.func_ty(t).params.len(),
             results: module.func_ty(t).results.len(),

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

@@ -1,7 +1,6 @@
-use crate::{runtime::RawWasmValue, BlockType, Error, LabelFrame, ModuleInstance, Result};
+use crate::{runtime::RawWasmValue, BlockType, Error, LabelFrame, Result};
 use alloc::{boxed::Box, vec::Vec};
-use log::{debug, info};
-use tinywasm_types::{BlockArgs, ValType, WasmValue};
+use tinywasm_types::{ValType, WasmValue};
 
 use super::blocks::Labels;
 
@@ -91,12 +90,7 @@ impl CallFrame {
 
     /// Break to a block at the given index (relative to the current frame)
     #[inline]
-    pub(crate) fn break_to(
-        &mut self,
-        break_to_relative: u32,
-        value_stack: &mut super::ValueStack,
-        module: &ModuleInstance,
-    ) -> Result<()> {
+    pub(crate) fn break_to(&mut self, break_to_relative: u32, value_stack: &mut super::ValueStack) -> Result<()> {
         let current_label = self.labels.top().ok_or(Error::LabelStackUnderflow)?;
         let break_to = self
             .labels

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

@@ -1,9 +1,8 @@
 use core::ops::Range;
 
-use crate::{runtime::RawWasmValue, Error, ModuleInstance, Result};
+use crate::{runtime::RawWasmValue, Error, Result};
 use alloc::vec::Vec;
 use log::info;
-use tinywasm_types::BlockArgs;
 
 // minimum stack size
 pub(crate) const STACK_SIZE: usize = 1024;
@@ -44,7 +43,7 @@ impl ValueStack {
     }
 
     #[inline]
-    pub(crate) fn truncate(&mut self, n: usize) {
+    pub(crate) fn _truncate(&mut self, n: usize) {
         assert!(self.top <= self.stack.len());
         self.top -= n;
         self.stack.truncate(self.top);
@@ -65,7 +64,7 @@ impl ValueStack {
     }
 
     #[inline]
-    pub(crate) fn extend(&mut self, values: impl IntoIterator<Item = RawWasmValue> + ExactSizeIterator) {
+    pub(crate) fn _extend(&mut self, values: impl IntoIterator<Item = RawWasmValue> + ExactSizeIterator) {
         self.top += values.len();
         self.stack.extend(values);
     }
@@ -125,7 +124,7 @@ mod tests {
 
     fn crate_stack<T: Into<RawWasmValue> + Copy>(data: &[T]) -> ValueStack {
         let mut stack = ValueStack::default();
-        stack.extend(data.iter().map(|v| (*v).into()));
+        stack._extend(data.iter().map(|v| (*v).into()));
         stack
     }