Resolve PR feedback

Signed-off-by: Lann Martin <lann.martin@fermyon.com>
spinframework · Jul 19, 2024 · 0df8436 · 0df8436
1 parent b295d23
commit 0df8436
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/factor-wasi/Cargo.toml b/crates/factor-wasi/Cargo.toml
@@ -7,7 +7,6 @@ edition = { workspace = true }
 [dependencies]
 async-trait = "0.1"
 cap-primitives = "3.0.0"
-spin-app = { path = "../app" }
 spin-factors = { path = "../factors" }
 tokio = { version = "1" }
 wasmtime = { workspace = true }

diff --git a/crates/factor-wasi/src/lib.rs b/crates/factor-wasi/src/lib.rs
@@ -3,10 +3,9 @@ mod wasi_2023_11_10;
 
 use std::{future::Future, net::SocketAddr, path::Path};
 
-use spin_app::AppComponent;
 use spin_factors::{
-    anyhow, Factor, FactorInstanceBuilder, InitContext, InstanceBuilders, PrepareContext,
-    RuntimeFactors, RuntimeFactorsInstanceState,
+    anyhow, AppComponent, Factor, FactorInstanceBuilder, InitContext, InstanceBuilders,
+    PrepareContext, RuntimeFactors, RuntimeFactorsInstanceState,
 };
 use tokio::io::{AsyncRead, AsyncWrite};
 use wasmtime_wasi::{

diff --git a/crates/factors/src/lib.rs b/crates/factors/src/lib.rs
@@ -7,7 +7,7 @@ pub use anyhow;
 pub use serde;
 pub use wasmtime;
 
-pub use spin_app::App;
+pub use spin_app::{App, AppComponent};
 pub use spin_factors_derive::RuntimeFactors;
 
 pub use crate::{
@@ -17,7 +17,7 @@ pub use crate::{
     runtime_factors::{RuntimeFactors, RuntimeFactorsInstanceState},
 };
 
-// Temporary wrappers while refactoring
+/// Result wrapper type defaulting to use [`Error`].
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Debug, thiserror::Error)]