Update spin

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -13,9 +13,9 @@ hyper = "1.0"
 libtest-mimic = "0.8"
 log = "0.4"
 owo-colors = { version = "4", features = ["supports-colors"] }
-spin-common = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
-spin-componentize = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
-spin-http = { git = "https://github.com/spinframework/spin", default-features = false, rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
+spin-common = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
+spin-componentize = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
+spin-http = { git = "https://github.com/spinframework/spin", default-features = false, rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
 spin-manifest = { workspace = true }
 temp-dir = "0.1.16"
 tokio = "1.0"
@@ -36,10 +36,10 @@ members = [
 
 [workspace.dependencies]
 anyhow = "1.0"
-spin-expressions = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
-spin-manifest = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
-spin-factor-outbound-networking = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
-spin-serde = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
+spin-expressions = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
+spin-manifest = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
+spin-factor-outbound-networking = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
+spin-serde = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
 toml = { version = "0.8", features = ["preserve_order"] }
 wit-bindgen-rt = { version = "0.42", features = ["bitflags"] }
 wit-component = "0.235"

Cargo.toml

@@ -349,7 +349,7 @@ struct IncomingBody<'a> {
     resource: wasmtime::component::ResourceAny,
 }
 
-impl<'a> IncomingBody<'a> {
+impl IncomingBody<'_> {
     fn stream<T>(
         &self,
         store: &mut wasmtime::Store<T>,
@@ -369,7 +369,7 @@ struct InputStream<'a> {
     resource: wasmtime::component::ResourceAny,
 }
 
-impl<'a> InputStream<'a> {
+impl InputStream<'_> {
     fn blocking_read<T>(
         &self,
         store: &mut wasmtime::Store<T>,
@@ -388,7 +388,7 @@ struct OutgoingBody<'a> {
     resource: wasmtime::component::ResourceAny,
 }
 
-impl<'a> OutgoingBody<'a> {
+impl OutgoingBody<'_> {
     fn write<T>(&self, store: &mut wasmtime::Store<T>) -> anyhow::Result<Result<OutputStream, ()>> {
         let stream = match self.guest.call_write(store, self.resource)? {
             Ok(s) => s,
@@ -406,7 +406,7 @@ struct OutputStream<'a> {
     resource: wasmtime::component::ResourceAny,
 }
 
-impl<'a> OutputStream<'a> {
+impl OutputStream<'_> {
     fn blocking_write_and_flush<T>(
         &self,
         store: &mut wasmtime::Store<T>,

conformance-tests/src/runtime.rs

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
-spin-routes = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
+spin-http-routes = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
 spin-manifest = { workspace = true }
 toml = { workspace = true }
 wit-bindgen-rt = { workspace = true }

crates/router/Cargo.toml

@@ -11,7 +11,7 @@ use bindings::{
         ErrorCode, Headers, IncomingRequest, OutgoingRequest, ResponseOutparam, Scheme,
     },
 };
-use spin_routes::{RouteMatch, Router};
+use spin_http_routes::{RouteMatch, Router};
 
 /// Print to the standard output.
 ///
@@ -112,7 +112,7 @@ fn router(manifest: &spin_manifest::schema::v2::AppManifest, base: &str) -> anyh
         })
         .collect::<Vec<_>>();
 
-    spin_routes::Router::build(base, routes.iter().map(|(c, t)| (c.as_str(), t)), None)
+    Router::build(base, routes.iter().map(|(c, t)| (c.as_str(), t)), None)
 }
 
 /// Apply any request transformations needed for the given route.

crates/router/src/lib.rs

@@ -11,8 +11,8 @@ ipnet = "2.11"
 spin-expressions = { workspace = true }
 spin-manifest = { workspace = true }
 spin-serde = { workspace = true }
-spin-locked-app = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
-spin-outbound-networking-config = { git = "https://github.com/spinframework/spin", rev = "9906b4e499e47bcc6ebff4e7fe70bb255a5f925d" }
+spin-locked-app = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
+spin-outbound-networking-config = { git = "https://github.com/spinframework/spin", rev = "4447abb7d7571fc887217045aff0ba349a8de955" }
 toml = { workspace = true }
 wit-bindgen-rt = { workspace = true }
 rusqlite = { version = "0.36", features = ["bundled", "wasm32-wasi-vfs"] }