diff --git a/Cargo.lock b/Cargo.lock index bd122a6d2..318d8a860 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2841,16 +2841,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ctor" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" -dependencies = [ - "quote", - "syn 2.0.118", -] - [[package]] name = "ctor" version = "0.6.3" @@ -4939,7 +4929,7 @@ dependencies = [ "candle-transformers", "chrono", "clap", - "ctor 0.2.9", + "ctor", "dirs", "dotenvy", "dtor 1.0.5", @@ -13924,7 +13914,7 @@ dependencies = [ "chrono", "colored", "const-str", - "ctor 0.6.3", + "ctor", "dirs", "futures", "git-version", diff --git a/crates/goose/Cargo.toml b/crates/goose/Cargo.toml index f826767f5..e2e916ec4 100644 --- a/crates/goose/Cargo.toml +++ b/crates/goose/Cargo.toml @@ -251,7 +251,7 @@ wiremock = { workspace = true } tokio = { workspace = true } tokio-util = { workspace = true, features = ["compat"] } dotenvy = { workspace = true } -ctor = { version = "0.2", default-features = false } +ctor = { version = "0.6", default-features = false, features = ["proc_macro"] } test-case = { workspace = true } env-lock = { workspace = true } rmcp = { workspace = true, features = ["transport-streamable-http-server"] } diff --git a/crates/goose/tests/subprocess_cleanup.rs b/crates/goose/tests/subprocess_cleanup.rs index 42ec6a964..ae58d421a 100644 --- a/crates/goose/tests/subprocess_cleanup.rs +++ b/crates/goose/tests/subprocess_cleanup.rs @@ -8,8 +8,8 @@ use std::time::{Duration, Instant}; const HELPER_ENV: &str = "GOOSE_SUBPROCESS_PARENT_DEATH_HELPER"; -#[ctor::ctor(unsafe)] -fn maybe_run_helper() { +#[ctor::ctor] +unsafe fn maybe_run_helper() { if std::env::var_os(HELPER_ENV).is_none() { return; }