From da2eafe02483cdd0e8f490410fc376947d39f87f Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 10 Sep 2025 15:25:35 -0500
Subject: [PATCH] test(help): Ensure consistent behavior regardless of rustup
 use

---
 tests/testsuite/cargo/help/mod.rs          | 2 ++
 tests/testsuite/cargo/help/stdout.term.svg | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/testsuite/cargo/help/mod.rs b/tests/testsuite/cargo/help/mod.rs
index ab26c860c53..bf24ac91d9a 100644
--- a/tests/testsuite/cargo/help/mod.rs
+++ b/tests/testsuite/cargo/help/mod.rs
@@ -6,6 +6,8 @@ use cargo_test_support::str;
 fn case() {
     snapbox::cmd::Command::cargo_ui()
         .arg("--help")
+        .env_remove("RUSTUP_HOME") // consistent behavior with/without
+        .env_remove("RUSTUP_TOOLCHAIN")
         .assert()
         .success()
         .stdout_eq(file!["stdout.term.svg"])
diff --git a/tests/testsuite/cargo/help/stdout.term.svg b/tests/testsuite/cargo/help/stdout.term.svg
index 541e3465a86..bf54694dbf9 100644
--- a/tests/testsuite/cargo/help/stdout.term.svg
+++ b/tests/testsuite/cargo/help/stdout.term.svg
@@ -24,9 +24,9 @@
 </tspan>
     <tspan x="10px" y="46px">
 </tspan>
-    <tspan x="10px" y="64px"><tspan class="fg-bright-green bold">Usage:</tspan><tspan class="bold"> </tspan><tspan class="fg-bright-cyan bold">cargo</tspan><tspan class="bold"> </tspan><tspan class="fg-cyan bold">[+toolchain] [OPTIONS] [COMMAND]</tspan>
+    <tspan x="10px" y="64px"><tspan class="fg-bright-green bold">Usage:</tspan><tspan class="bold"> </tspan><tspan class="fg-bright-cyan bold">cargo</tspan><tspan class="bold"> </tspan><tspan class="fg-cyan bold">[OPTIONS] [COMMAND]</tspan>
 </tspan>
-    <tspan x="10px" y="82px"><tspan class="bold">       </tspan><tspan class="fg-bright-cyan bold">cargo</tspan><tspan class="bold"> </tspan><tspan class="fg-cyan bold">[+toolchain] [OPTIONS]</tspan><tspan class="bold"> </tspan><tspan class="fg-bright-cyan bold">-Zscript</tspan><tspan class="bold"> </tspan><tspan class="fg-cyan bold">&lt;MANIFEST_RS&gt; [ARGS]...</tspan>
+    <tspan x="10px" y="82px"><tspan class="bold">       </tspan><tspan class="fg-bright-cyan bold">cargo</tspan><tspan class="bold"> </tspan><tspan class="fg-cyan bold">[OPTIONS]</tspan><tspan class="bold"> </tspan><tspan class="fg-bright-cyan bold">-Zscript</tspan><tspan class="bold"> </tspan><tspan class="fg-cyan bold">&lt;MANIFEST_RS&gt; [ARGS]...</tspan>
 </tspan>
     <tspan x="10px" y="100px">
 </tspan>