From 30c4aa2cf4972607244354f2169debf88d97b991 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 14 Jan 2023 12:15:20 -0800 Subject: [PATCH] Delete more macro test remnants --- .github/workflows/ci.yml | 4 ---- test_suite/Cargo.toml | 1 - test_suite/build.rs | 27 --------------------------- 3 files changed, 32 deletions(-) delete mode 100644 test_suite/build.rs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27d437f8..ad848d6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,6 @@ jobs: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@nightly - run: cd test_suite && cargo test --features unstable - - uses: dtolnay/install@cargo-expand - if: github.event_name != 'pull_request' - - run: cd test_suite && cargo test --features expandtest --test expandtest -- --include-ignored - if: github.event_name != 'pull_request' windows: name: Test suite (windows) diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml index 811cd322..4f084fdf 100644 --- a/test_suite/Cargo.toml +++ b/test_suite/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" publish = false [features] -expandtest = [] unstable = ["serde/unstable"] [dependencies] diff --git a/test_suite/build.rs b/test_suite/build.rs deleted file mode 100644 index 3ace7d3d..00000000 --- a/test_suite/build.rs +++ /dev/null @@ -1,27 +0,0 @@ -use std::process::{Command, ExitStatus, Stdio}; - -fn has_cargo_expand() -> bool { - let cargo_expand = if cfg!(windows) { - "cargo-expand.exe" - } else { - "cargo-expand" - }; - - Command::new(cargo_expand) - .arg("--version") - .stdin(Stdio::null()) - .stdout(Stdio::null()) - .stderr(Stdio::null()) - .status() - .as_ref() - .map(ExitStatus::success) - .unwrap_or(false) -} - -fn main() { - println!("cargo:rerun-if-changed=build.rs"); - - if cfg!(feature = "expandtest") && has_cargo_expand() { - println!("cargo:rustc-cfg=expandtest"); - } -}