Address PR comments

Signed-off-by: Brian Hardock <[email protected]>

Author: fibonacci1729

Cargo.lock

@@ -25,8 +25,8 @@ postgres_range = { version = "0.11.1", optional = true }
 rust_decimal = { version = "1.37.2", default-features = false, optional = true }
 spin-executor = { version = "5.0.0", path = "crates/executor" }
 spin-macro = { version = "5.0.0", path = "crates/macro" }
-spin-wasip3-http = { version = "5.0.0", path = "crates/spin-wasip3-http" }
-spin-wasip3-http-macro = { version = "5.0.0", path = "crates/spin-wasip3-http-macro" }
+spin-wasip3-http = { version = "5.0.0", path = "crates/spin-wasip3-http", optional = true }
+spin-wasip3-http-macro = { version = "5.0.0", path = "crates/spin-wasip3-http-macro", optional = true }
 thiserror = { workspace = true }
 uuid = { version = "1.18.0", optional = true }
 wit-bindgen = { workspace = true }
@@ -44,6 +44,7 @@ default = ["export-sdk-language", "json", "postgres4-types"]
 export-sdk-language = []
 json = ["dep:serde", "dep:serde_json"]
 postgres4-types = ["dep:rust_decimal", "dep:uuid", "dep:postgres_range", "json"]
+wasip3-unstable = ["dep:spin-wasip3-http", "dep:spin-wasip3-http-macro"]
 
 [workspace]
 resolver = "2"
@@ -112,4 +113,3 @@ once_cell = "1.18.0"
 thiserror = "2.0.17"
 # Pin to the last version that targeted WASI 0.2.0
 wasi = "=0.13.1"
-wasip3 = "0.2.0"

Cargo.toml

@@ -8,7 +8,7 @@ repository.workspace = true
 rust-version.workspace = true
 homepage.workspace = true
 description = """
-Rust procedural macros for Spin and associated WIT files
+Rust procedural macros for Spin and WASIp3
 """
 
 [lib]

crates/spin-wasip3-http-macro/Cargo.toml

@@ -27,7 +27,7 @@ pub fn http_component(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
             impl ::spin_sdk::http_wasip3::wasip3::exports::http::handler::Guest for self::Spin {
                 async fn handle(request: ::spin_sdk::http_wasip3::wasip3::http::types::Request) -> Result<::spin_sdk::http_wasip3::wasip3::http::types::Response, ::spin_sdk::http_wasip3::wasip3::http::types::ErrorCode> {
-                    let request = <::spin_sdk::http_wasip3::IncomingRequest as ::spin_sdk::http_wasip3::FromRequest>::from_request(request)?;
+                    let request = <::spin_sdk::http_wasip3::Request as ::spin_sdk::http_wasip3::FromRequest>::from_request(request)?;
                     ::spin_sdk::http_wasip3::IntoResponse::into_response(super::#func_name(request).await)
                 }
             }

crates/spin-wasip3-http-macro/src/lib.rs

@@ -14,5 +14,4 @@ bytes = { workspace = true }
 http-body = { workspace = true }
 http-body-util = { workspace = true }
 hyperium = { workspace = true }
-wasip3-http-ext = { version = "5.0.0", path = "../wasip3-http-ext" }
-wasip3 = { workspace = true }
+wasip3-http-ext = { version = "5.0.0", path = "../wasip3-http-ext" }