Fix mistakes and clippy diagnostics

Author: WhaleKit

crates/tinywasm/src/config.rs

@@ -1,6 +1,4 @@
-use core::{default, fmt};
-
-use crate::SuspendConditions;
+use core::fmt;
 
 /// Default initial size for the 32-bit value stack (i32, f32 values).
 pub const DEFAULT_VALUE_STACK_32_INIT_SIZE: usize = 32 * 1024; // 32KB

crates/tinywasm/src/func.rs

@@ -81,7 +81,7 @@ impl FuncHandle {
         // 7. Push the frame f to the call stack
         // & 8. Push the values to the stack (Not needed since the call frame owns the values)
 
-        let mut stack = Stack::new(call_frame, &store.config);
+        let stack = Stack::new(call_frame, &store.config);
 
         // 9. Invoke the function instance
         let runtime = store.runtime();

crates/tinywasm/src/interpreter/executor.rs

@@ -126,17 +126,16 @@ impl<'store, 'stack> Executor<'store, 'stack> {
     /// or after all state mutations including increasing instruction pointer
     #[must_use = "If this returns ControlFlow::Break, the caller should propagate it"]
     fn check_should_suspend(&mut self) -> ControlFlow<ReasonToBreak> {
-        if let Some(flag) = &self.store.suspend_cond.suspend_flag {
-            if flag.load(core::sync::atomic::Ordering::Acquire) {
-                return ReasonToBreak::Suspended(SuspendReason::SuspendedFlag, None).into();
-            }
+        if let Some(flag) = &self.store.suspend_cond.suspend_flag 
+            && flag.load(core::sync::atomic::Ordering::Acquire) {
+            return ReasonToBreak::Suspended(SuspendReason::SuspendedFlag, None).into();
+            
         }
 
         #[cfg(feature = "std")]
-        if let Some(when) = &self.store.suspend_cond.timeout_instant {
-            if crate::std::time::Instant::now() >= *when {
-                return ReasonToBreak::Suspended(SuspendReason::SuspendedEpoch, None).into();
-            }
+        if let Some(when) = &self.store.suspend_cond.timeout_instant 
+            && crate::std::time::Instant::now() >= *when {
+            return ReasonToBreak::Suspended(SuspendReason::SuspendedEpoch, None).into();
         }
 
         if let Some(mut cb) = self.store.suspend_cond.suspend_cb.take() {
@@ -879,7 +878,7 @@ impl<'store, 'stack> Executor<'store, 'stack> {
         }
     }
     fn exec_call_direct<const IS_RETURN_CALL: bool>(&mut self, v: u32) -> ControlFlow<ReasonToBreak> {
-        self.check_should_suspend(); // don't commit to function if we should be stopping now
+        self.check_should_suspend()?; // don't commit to function if we should be stopping now
         let func_inst = self.store.get_func(self.module.resolve_func_addr(v));
         match func_inst.func.clone() {
             crate::Function::Wasm(wasm_func) => self.exec_call::<IS_RETURN_CALL>(wasm_func, func_inst.owner),

crates/tinywasm/src/interpreter/mod.rs

@@ -68,7 +68,7 @@ impl<'_a> coro::CoroState<Stack, FuncContext<'_a>> for SuspendedInterpreterRunti
             }
         };
 
-        return Ok(match res {
+        Ok(match res {
             ExecOutcome::Return(()) => {
                 // we are finished
                 InterpreterRuntimeResumeOutcome::Return(stack)
@@ -79,7 +79,7 @@ impl<'_a> coro::CoroState<Stack, FuncContext<'_a>> for SuspendedInterpreterRunti
                 self.0 = Some(SuspendedInterpreterRuntimeBody::new(host_coro, stack, module, cf));
                 InterpreterRuntimeResumeOutcome::Suspended(suspend_reason)
             }
-        });
+        })
     }
 }
 

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

@@ -4,7 +4,7 @@ use super::BlockType;
 use crate::Trap;
 use crate::interpreter::executor::ReasonToBreak;
 use crate::interpreter::values::*;
-use crate::{Error, unlikely};
+use crate::unlikely;
 
 use alloc::boxed::Box;
 use alloc::{rc::Rc, vec, vec::Vec};

crates/tinywasm/src/store/mod.rs

@@ -1,5 +1,4 @@
 use alloc::{boxed::Box, format, string::ToString, vec::Vec};
-use core::default;
 use core::fmt::Debug;
 use core::sync::atomic::{AtomicUsize, Ordering};
 use tinywasm_types::*;