fix(test): strip RUSTUP_TOOLCHAIN_SOURCE from test environment#16857
Conversation
|
r? @epage rustbot has assigned @epage. Use Why was this reviewer chosen?The reviewer was selected based on:
|
| .env_remove("RUSTDOC") | ||
| .env_remove("RUSTDOCFLAGS") | ||
| .env_remove("RUSTFLAGS") | ||
| .env_remove("RUSTUP_TOOLCHAIN_SOURCE") |
There was a problem hiding this comment.
Removing this separately seems fine for cargo devs that has a directory override, though I am not sure if we want to wait for #16469 or not.
There was a problem hiding this comment.
I am not sure either. If this truly doesn't affect anything else, it would be nice to have it in sooner to make running tests less cumbersome, but at the same time, I don't want to make #16469 harder.
Was the warning that the Rust toolchain is overridden for your Rust projects folder? I think that makes sense, actually. There is currently no requirement that a toolchain override be narrowly scoped. If you wanted to test this, you could try moving the Cargo repository out of the the Rust projects folder and see if the warnings go away. (Sorry if I have misunderstood your situation.) |
Update cargo submodule 5 commits in 101549dddbd2b08e806f50154e3aa4cb3374cc21..eb94155a9a60943bd7b1cb04abec42f5d0de6ddc 2026-04-08 12:51:20 +0000 to 2026-04-09 13:10:20 +0000 - Revert "GitHub fast path uses `http_async`" (rust-lang/cargo#16861) - Correct spelling in cargo info man page (rust-lang/cargo#16863) - chore: Update annotate-snippets to 0.12.15 (rust-lang/cargo#16859) - fix(test): strip RUSTUP_TOOLCHAIN_SOURCE from test environment (rust-lang/cargo#16857) - Support target.'cfg(..)'.rustdocflags analogously to rustflags (rust-lang/cargo#16846) r? ghost
Rollup merge of #155042 - weihanglo:update-cargo, r=weihanglo Update cargo submodule 5 commits in 101549dddbd2b08e806f50154e3aa4cb3374cc21..eb94155a9a60943bd7b1cb04abec42f5d0de6ddc 2026-04-08 12:51:20 +0000 to 2026-04-09 13:10:20 +0000 - Revert "GitHub fast path uses `http_async`" (rust-lang/cargo#16861) - Correct spelling in cargo info man page (rust-lang/cargo#16863) - chore: Update annotate-snippets to 0.12.15 (rust-lang/cargo#16859) - fix(test): strip RUSTUP_TOOLCHAIN_SOURCE from test environment (rust-lang/cargo#16857) - Support target.'cfg(..)'.rustdocflags analogously to rustflags (rust-lang/cargo#16846) r? ghost
While I was trying to run the testsuite earlier, I kept running into issues with
installtests failing due tocargowarning about toolchain overrides, as I have an override for my whole Rust projects folder. After looking into it for a bit, I found that removingRUSTUP_TOOLCHAIN_SOURCEfrom thetest_envresolved the warnings without causing any other tests to fail. I spent some time looking at #16131 and #16469, trying to find ways this could cause problems, and while I couldn't find any, I am not very confident in my assessment. @smoelius do you have any thoughts?