Skip to content

Commit

Permalink
Remove condition on RUSTUP_WINDOWS_PATH_ADD_BIN (rust-lang#15017)
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
weihanglo authored Jan 4, 2025
2 parents d10e9cd + e6ecef6 commit 0f9e730
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions crates/cargo-test-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 0f9e730

Please sign in to comment.