From e6ecef6cc83eec2fc0ebf19fd80fac2ac0ddf774 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sat, 4 Jan 2025 11:49:20 -0800 Subject: [PATCH] Remove condition on RUSTUP_WINDOWS_PATH_ADD_BIN This is no longer needed since rustup 1.27.1 which changed the default to false. --- crates/cargo-test-macro/src/lib.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/crates/cargo-test-macro/src/lib.rs b/crates/cargo-test-macro/src/lib.rs index f9740873184..01265f8fba0 100644 --- a/crates/cargo-test-macro/src/lib.rs +++ b/crates/cargo-test-macro/src/lib.rs @@ -312,13 +312,6 @@ fn has_rustup_stable() -> bool { // This cannot run on rust-lang/rust CI due to the lack of rustup. return false; } - if cfg!(windows) && !is_ci() && option_env!("RUSTUP_WINDOWS_PATH_ADD_BIN").is_none() { - // There is an issue with rustup that doesn't allow recursive cargo - // invocations. Disable this on developer machines if the environment - // variable is not enabled. This can be removed once - // https://github.com/rust-lang/rustup/issues/3036 is resolved. - return false; - } // Cargo mucks with PATH on Windows, adding sysroot host libdir, which is // "bin", which circumvents the rustup wrapper. Use the path directly from // CARGO_HOME.