Updated the return type in the 'trigger::run' func to use 'BoxFuture' for better async handling

Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>

Author: Mossaka

Cargo.lock

@@ -1,8 +1,4 @@
-use std::{
-    collections::{hash_map::DefaultHasher, HashSet},
-    env,
-    hash::{Hash, Hasher},
-};
+use std::{collections::HashSet, env, hash::Hash};
 
 use anyhow::{Context, Result};
 use containerd_shim_wasm::{
@@ -221,10 +217,8 @@ impl SpinSandbox {
 }
 
 impl Compiler for SpinCompiler {
-    fn cache_key(&self) -> impl Hash + Send {
-        let mut hasher = DefaultHasher::new();
-        self.0.precompile_compatibility_hash().hash(&mut hasher);
-        hasher.finish()
+    fn cache_key(&self) -> impl Hash {
+        self.0.precompile_compatibility_hash()
     }
 
     async fn compile(&self, layers: &[WasmLayer]) -> Result<Vec<Option<Vec<u8>>>> {

containerd-shim-spin/src/engine.rs

@@ -1,5 +1,7 @@
-use std::{collections::HashSet, future::Future, path::Path, pin::Pin};
+use std::{collections::HashSet, path::Path};
 
+use anyhow::Result;
+use futures::{future::BoxFuture, FutureExt};
 use log::info;
 use spin_app::{locked::LockedApp, App};
 use spin_runtime_factors::{FactorsBuilder, TriggerFactors};
@@ -27,7 +29,7 @@ pub(crate) async fn run<T>(
     cli_args: T::CliArgs,
     app: App,
     loader: &ComponentLoader,
-) -> anyhow::Result<Pin<Box<dyn Future<Output = anyhow::Result<()>> + Send>>>
+) -> Result<BoxFuture<'static, Result<()>>>
 where
     T: Trigger<TriggerFactors> + 'static,
 {
@@ -38,7 +40,7 @@ where
     let future = builder
         .run(app, factors_config(), Default::default(), loader)
         .await?;
-    Ok(Box::pin(future))
+    Ok(future.boxed())
 }
 
 /// Configuration for the factors.