Eliminate reliance on ctor

Author: smoelius

.github/workflows/ci.yml

@@ -108,9 +108,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Test `ci`
+      - name: Run `ci` tests
         if: matrix.environment == 'ubuntu-latest'
-        run: cargo test --config "$GROUP_RUNNER" -p ci
+        run: cargo run -p ci
 
   all-checks:
     needs: [test]

Cargo.lock

@@ -40,7 +40,6 @@ reqwest = { version = "0.13", default-features = false, features = [
 
 [dev-dependencies]
 assert_cmd = "2.2"
-ctor = "1.0"
 octocrab = "0.49"
 predicates = "3.1"
 rustls = { version = "0.23", default-features = false, features = [

Cargo.toml

@@ -4,9 +4,13 @@ version = "0.1.0"
 edition = "2024"
 publish = false
 
+[dependencies]
+anyhow = "1.0"
+cargo_metadata = "0.23"
+elaborate = "0.2"
+
 [dev-dependencies]
 assert_cmd = "2.2"
-ctor = "1.0"
 elaborate = "0.2"
 regex = "1.12"
 serde_json = "1.0"

ci/Cargo.toml

@@ -0,0 +1,44 @@
+use anyhow::{Result, anyhow, bail};
+use cargo_metadata::{Message, camino::Utf8PathBuf};
+use elaborate::std::process::CommandContext;
+use std::process::Command;
+
+fn main() {
+    let executable = test_executable().unwrap();
+    let status = Command::new(executable).status_wc().unwrap();
+    assert!(status.success());
+}
+
+fn test_executable() -> Result<Utf8PathBuf> {
+    let mut command = Command::new("cargo");
+    let output = command
+        .args(["build", "--workspace", "--tests", "--message-format=json"])
+        .output_wc()?;
+    if !output.status.success() {
+        bail!("command failed: {command:?}");
+    }
+    let messages =
+        Message::parse_stream(output.stdout.as_slice()).collect::<Result<Vec<_>, _>>()?;
+    let executables = messages
+        .into_iter()
+        .filter_map(|message| {
+            if let Message::CompilerArtifact(artifact) = message
+                && artifact.target.name == "ci"
+                && artifact.target.is_lib()
+                && artifact.profile.test
+                && let Some(executable) = artifact.executable
+            {
+                Some(executable)
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<_>>();
+    if executables.len() >= 2 {
+        bail!("found multiple test executables: {executables:?}");
+    }
+    executables
+        .into_iter()
+        .next()
+        .ok_or_else(|| anyhow!("found no test executables"))
+}

ci/src/bin/ci.rs

@@ -2,15 +2,14 @@
 
 use assert_cmd::assert::OutputAssertExt;
 use elaborate::std::{
-    env::{set_current_dir_wc, var_wc},
+    env::var_wc,
     fs::{read_to_string_wc, write_wc},
     path::PathContext,
     process::CommandContext,
 };
 use regex::Regex;
 use similar_asserts::SimpleDiff;
 use std::{
-    env::remove_var,
     ffi::OsStr,
     ops::Range,
     path::Path,
@@ -21,14 +20,6 @@ use tempfile::tempdir;
 use testing::split_at_cut_lines;
 use walkdir::WalkDir;
 
-#[ctor::ctor(unsafe)]
-fn initialize() {
-    unsafe {
-        remove_var("CARGO_TERM_COLOR");
-    }
-    let _ = set_current_dir_wc("..");
-}
-
 #[test]
 fn clippy() {
     Command::new("cargo")

ci/src/lib.rs

@@ -6,7 +6,6 @@ publish = false
 
 [dev-dependencies]
 assert_cmd = "2.2"
-ctor = "1.0"
 elaborate = "0.2"
 regex = "1.12"
 snapbox = "1.2"

ei/Cargo.toml

@@ -1,15 +1,6 @@
-use elaborate::std::env::set_current_dir_wc;
-use std::{env::remove_var, process::Command};
+use std::process::Command;
 use testing::{Tee, tee};
 
-#[ctor::ctor(unsafe)]
-fn initialize() {
-    unsafe {
-        remove_var("CARGO_TERM_COLOR");
-    }
-    let _ = set_current_dir_wc("..");
-}
-
 #[test]
 fn dogfood() {
     let mut command = Command::new("cargo");
@@ -22,6 +13,7 @@ fn dogfood() {
         "unmaintained",
         "--color=never",
     ]);
+    command.current_dir("..");
 
     let output = tee(command, Tee::Stdout).unwrap();
 

ei/tests/dogfood.rs

@@ -1,11 +1,10 @@
 use elaborate::std::{
-    env::{set_current_dir_wc, var_wc},
+    env::var_wc,
     fs::{read_to_string_wc, write_wc},
 };
 use regex::Regex;
 use snapbox::assert_data_eq;
 use std::{
-    env::remove_var,
     io::{Write, stderr},
     process::Command,
     sync::LazyLock,
@@ -17,21 +16,14 @@ const PATH_STDOUT: &str = concat!(
     "/tests/rustsec_advisories.stdout"
 );
 
-#[ctor::ctor(unsafe)]
-fn initialize() {
-    unsafe {
-        remove_var("CARGO_TERM_COLOR");
-    }
-    let _ = set_current_dir_wc("..");
-}
-
 #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
 #[test]
 fn rustsec_advisories() {
     let mut command = Command::new("cargo");
     command
         .args(["run", "--example=rustsec_advisories"])
-        .env("RUST_BACKTRACE", "0");
+        .env("RUST_BACKTRACE", "0")
+        .current_dir("..");
 
     let output = tee(command, Tee::Stdout).unwrap();
 

ei/tests/rustsec_advisories.rs

@@ -1,25 +1,16 @@
-use elaborate::std::{
-    env::{set_current_dir_wc, var_wc},
-    fs::write_wc,
-};
+use elaborate::std::{env::var_wc, fs::write_wc};
 use snapbox::{Data, assert_data_eq};
-use std::{env::remove_var, path::PathBuf, process::Command};
+use std::{path::PathBuf, process::Command};
 use testing::{Tee, tee};
 
-#[ctor::ctor(unsafe)]
-fn initialize() {
-    unsafe {
-        remove_var("CARGO_TERM_COLOR");
-    }
-    let _ = set_current_dir_wc("..");
-}
-
 #[test]
 fn rustsec_issues() {
     const PATH_STDOUT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests/rustsec_issues.stdout");
 
     let mut command = Command::new("cargo");
-    command.args(["run", "--example=rustsec_issues"]);
+    command
+        .args(["run", "--example=rustsec_issues"])
+        .current_dir("..");
 
     let output = tee(command, Tee::Stdout).unwrap();