From d94c325d6c2ff47ed2d6c73a7e025910ebd8840e Mon Sep 17 00:00:00 2001 From: Yuya Nishihara Date: Sat, 7 Oct 2023 22:22:37 +0900 Subject: [PATCH] tests: use if cfg!(..) instead of #[cfg(..)] to insert Windows-specific config The code compiles on all platforms, so I think `if cfg!(..)` is better. --- cli/tests/common/mod.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cli/tests/common/mod.rs b/cli/tests/common/mod.rs index 20d8ca714..c04b18ae2 100644 --- a/cli/tests/common/mod.rs +++ b/cli/tests/common/mod.rs @@ -16,6 +16,7 @@ use std::cell::RefCell; use std::collections::HashMap; use std::path::{Path, PathBuf}; +use itertools::Itertools as _; use regex::{Captures, Regex}; use tempfile::TempDir; use testutils; @@ -106,10 +107,7 @@ impl TestEnvironment { cmd.env("JJ_TIMESTAMP", timestamp.to_rfc3339()); cmd.env("JJ_OP_TIMESTAMP", timestamp.to_rfc3339()); - #[cfg(all(windows, target_env = "gnu"))] - { - use itertools::Itertools as _; - + if cfg!(all(windows, target_env = "gnu")) { // MinGW executables cannot run without `mingw\bin` in the PATH (which we're // clearing above), so we add it again here. if let Ok(path_var) = std::env::var("PATH").or_else(|_| std::env::var("Path")) {