Merge pull request #2751 from fermyon/no-more-2

Author: rylev

Cargo.lock

@@ -62,8 +62,8 @@ spin-telemetry = { path = "crates/telemetry", features = [
   "tracing-log-compat",
 ] }
 spin-templates = { path = "crates/templates" }
-spin-trigger2 = { path = "crates/trigger2" }
-spin-trigger-http2 = { path = "crates/trigger-http2" }
+spin-trigger = { path = "crates/trigger" }
+spin-trigger-http = { path = "crates/trigger-http" }
 spin-trigger-redis = { path = "crates/trigger-redis" }
 
 tempfile = "3.8.0"
@@ -113,9 +113,9 @@ wit-component = "0.19.0"
 # TODO(factors): default = ["llm"]
 all-tests = ["extern-dependencies-tests"]
 extern-dependencies-tests = []
-llm = ["spin-trigger-http2/llm"]
-llm-metal = ["llm", "spin-trigger-http2/llm-metal"]
-llm-cublas = ["llm", "spin-trigger-http2/llm-cublas"]
+llm = ["spin-trigger-http/llm"]
+llm-metal = ["llm", "spin-trigger-http/llm-metal"]
+llm-cublas = ["llm", "spin-trigger-http/llm-cublas"]
 
 [workspace]
 members = [

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "spin-trigger-http2"
+name = "spin-trigger-http"
 version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }
@@ -8,9 +8,9 @@ edition = { workspace = true }
 doctest = false
 
 [features]
-llm = ["spin-trigger2/llm"]
-llm-metal = ["spin-trigger2/llm-metal"]
-llm-cublas = ["spin-trigger2/llm-cublas"]
+llm = ["spin-trigger/llm"]
+llm-metal = ["spin-trigger/llm-metal"]
+llm-cublas = ["spin-trigger/llm-cublas"]
 
 [dependencies]
 anyhow = "1.0"
@@ -36,7 +36,7 @@ spin-factor-wasi = { path = "../factor-wasi" }
 spin-http = { path = "../http" }
 spin-outbound-networking = { path = "../outbound-networking" }
 spin-telemetry = { path = "../telemetry" }
-spin-trigger2 = { path = "../trigger2" }
+spin-trigger = { path = "../trigger" }
 spin-world = { path = "../world" }
 terminal = { path = "../terminal" }
 tls-listener = { version = "0.10.0", features = ["rustls"] }

crates/trigger-http2/Cargo.toml renamed to crates/trigger-http/Cargo.toml

@@ -20,7 +20,7 @@ use anyhow::{bail, Context};
 use clap::Args;
 use serde::Deserialize;
 use spin_app::App;
-use spin_trigger2::Trigger;
+use spin_trigger::Trigger;
 use wasmtime_wasi_http::bindings::wasi::http::types::ErrorCode;
 
 pub use server::HttpServer;
@@ -29,8 +29,8 @@ pub use tls::TlsConfig;
 
 pub(crate) use wasmtime_wasi_http::body::HyperIncomingBody as Body;
 
-pub(crate) type TriggerApp = spin_trigger2::TriggerApp<HttpTrigger>;
-pub(crate) type TriggerInstanceBuilder<'a> = spin_trigger2::TriggerInstanceBuilder<'a, HttpTrigger>;
+pub(crate) type TriggerApp = spin_trigger::TriggerApp<HttpTrigger>;
+pub(crate) type TriggerInstanceBuilder<'a> = spin_trigger::TriggerInstanceBuilder<'a, HttpTrigger>;
 
 #[derive(Args)]
 pub struct CliArgs {