diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d1b381..1db3027 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: rustup +nightly component add clippy cargo install cargo-dylint dylint-link || true cargo install cargo-supply-chain || true - cargo install group-runner || true + cargo install unset || true - name: Update if: ${{ runner.os == 'Linux' }} @@ -83,7 +83,7 @@ jobs: run: cargo test --no-run - name: Test - run: cargo test --config "target.'cfg(all())'.runner = 'group-runner'" + run: cargo test --config "target.'cfg(all())'.runner = 'unset'" all-checks: needs: [test] diff --git a/Cargo.lock b/Cargo.lock index bf780c4..abab5a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,6 @@ dependencies = [ "anyhow", "assert_cmd", "cargo_metadata", - "ctor", "home", "regex", "serde", @@ -174,16 +173,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "ctor" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f521dd9c9e5f03986eb5c674b14b21e9ccf2eb9f98fecb681100214d5e9e4f" -dependencies = [ - "link-section", - "linktime-proc-macro", -] - [[package]] name = "difflib" version = "0.4.0" @@ -309,18 +298,6 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" -[[package]] -name = "link-section" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0567ec9fe5ffdf9241cd90a7629f250a5f903d6ff4573cf7903308662d6fce40" - -[[package]] -name = "linktime-proc-macro" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44cd706ff0d503ee32b2071166510ca27e281228de10cd3aa8d35ff94560f81" - [[package]] name = "linux-raw-sys" version = "0.12.1" diff --git a/Cargo.toml b/Cargo.toml index 5749993..2d30b46 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,6 @@ xdg = "3.0" [dev-dependencies] assert_cmd = "2.2" cargo_metadata = "0.23" -ctor = "0.12" serde = "1.0" serde_json = "1.0" similar-asserts = "2.0" diff --git a/src/util/common.rs b/src/util/common.rs index 26ee7fd..3c96cdb 100644 --- a/src/util/common.rs +++ b/src/util/common.rs @@ -119,7 +119,7 @@ pub fn split_and_expand(build_script_path: &Path) -> Result> { .into_iter() .map(|arg| expand(&arg, Some(build_script_path))) .collect::>>()?; - eprintln!("expanded `BUILD_WRAP_CMD`: {:#?}", &expanded_args); + eprintln!("expanded `BUILD_WRAP_CMD`: {expanded_args:#?}"); ensure!( !expanded_args.is_empty(), "expanded `BUILD_WRAP_CMD` is empty or all whitespace" diff --git a/tests/integration/util.rs b/tests/integration/util.rs index ad6adc7..d2e332d 100644 --- a/tests/integration/util.rs +++ b/tests/integration/util.rs @@ -24,13 +24,6 @@ use std::{ mod main_util; pub use main_util::*; -#[ctor::ctor] -fn initialize() { - unsafe { - env::set_var("CARGO_TERM_COLOR", "never"); - } -} - #[must_use] pub fn build_with_build_wrap() -> Command { let build_wrap = env!("CARGO_BIN_EXE_build-wrap"); diff --git a/unset.txt b/unset.txt new file mode 100644 index 0000000..17edb6b --- /dev/null +++ b/unset.txt @@ -0,0 +1 @@ +CARGO_TERM_COLOR