Skip to content

Commit 0f9e730

Browse files
authored
Remove condition on RUSTUP_WINDOWS_PATH_ADD_BIN (#15017)
This is no longer needed since rustup 1.27.1 which changed the default to false. ### How should we test and review this PR? On windows, run `cargo test --test testsuite -- global_cache_tracker`
2 parents d10e9cd + e6ecef6 commit 0f9e730

File tree

1 file changed

+0
-7
lines changed
  • crates/cargo-test-macro/src

1 file changed

+0
-7
lines changed

crates/cargo-test-macro/src/lib.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,6 @@ fn has_rustup_stable() -> bool {
312312
// This cannot run on rust-lang/rust CI due to the lack of rustup.
313313
return false;
314314
}
315-
if cfg!(windows) && !is_ci() && option_env!("RUSTUP_WINDOWS_PATH_ADD_BIN").is_none() {
316-
// There is an issue with rustup that doesn't allow recursive cargo
317-
// invocations. Disable this on developer machines if the environment
318-
// variable is not enabled. This can be removed once
319-
// https://github.com/rust-lang/rustup/issues/3036 is resolved.
320-
return false;
321-
}
322315
// Cargo mucks with PATH on Windows, adding sysroot host libdir, which is
323316
// "bin", which circumvents the rustup wrapper. Use the path directly from
324317
// CARGO_HOME.

0 commit comments

Comments
 (0)