diff --git a/Cargo.lock b/Cargo.lock index 73c4e039c..0fa458fb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -916,16 +916,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "ctor" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" -dependencies = [ - "quote", - "syn 2.0.100", -] - [[package]] name = "ctr" version = "0.9.2" @@ -3677,7 +3667,6 @@ dependencies = [ "console", "contracts", "crossbeam-channel", - "ctor", "demand", "digest", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index ee2f77a7d..6b64a86de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -176,7 +176,6 @@ toml = "0.8" indexmap = "2" [dev-dependencies] -ctor = "0.2" insta = { version = "1", features = ["filters", "json"] } mockito = "1.6.1" pretty_assertions = "1" diff --git a/src/main.rs b/src/main.rs index 2550b1b49..9761442e9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,6 +84,9 @@ pub(crate) use crate::toolset::install_state; use crate::ui::multi_progress_report::MultiProgressReport; fn main() -> eyre::Result<()> { + if cfg!(test) { + test::init(); + } color_eyre::install()?; measure!("main", { let args = env::args().collect_vec(); diff --git a/src/test.rs b/src/test.rs index 3ef8d71aa..b8cee8059 100644 --- a/src/test.rs +++ b/src/test.rs @@ -5,8 +5,7 @@ use indoc::indoc; use crate::{env, file}; -#[ctor::ctor] -fn init() { +pub fn init() { if env::var("RUST_LOG").is_err() { env::set_var("RUST_LOG", "debug") }