From 3f57fa568c137ec986d161e3332c21c175012f96 Mon Sep 17 00:00:00 2001
From: Melvin Wang <melvin.mc.wang@gmail.com>
Date: Tue, 26 Mar 2024 18:40:56 -0700
Subject: [PATCH] fix: reset CARGO env var to fix wrong CARGO in commands

fixes #1059
---
 src/lib/toolchain.rs      | 2 +-
 src/lib/toolchain_test.rs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/toolchain.rs b/src/lib/toolchain.rs
index 1ea79e46..4b268894 100644
--- a/src/lib/toolchain.rs
+++ b/src/lib/toolchain.rs
@@ -148,5 +148,5 @@ pub(crate) fn get_cargo_binary_path(toolchain: &ToolchainSpecifier) -> Option<St
 }
 
 pub(crate) fn remove_rust_env_vars() {
-    envmnt::remove_all(&vec!["RUSTC", "RUSTDOC", "RUSTFLAGS"]);
+    envmnt::remove_all(&vec!["CARGO", "RUSTC", "RUSTDOC", "RUSTFLAGS"]);
 }
diff --git a/src/lib/toolchain_test.rs b/src/lib/toolchain_test.rs
index 844d39b7..3239069d 100644
--- a/src/lib/toolchain_test.rs
+++ b/src/lib/toolchain_test.rs
@@ -124,16 +124,19 @@ fn get_cargo_binary_path_valid() {
 #[test]
 #[ignore]
 fn remove_rust_env_vars_existed() {
+    envmnt::set("CARGO", "bad1");
     envmnt::set("RUSTC", "bad1");
     envmnt::set("RUSTDOC", "bad2");
     envmnt::set("RUSTFLAGS", "bad3");
 
+    assert!(envmnt::exists("CARGO"));
     assert!(envmnt::exists("RUSTC"));
     assert!(envmnt::exists("RUSTDOC"));
     assert!(envmnt::exists("RUSTFLAGS"));
 
     remove_rust_env_vars();
 
+    assert!(!envmnt::exists("CARGO"));
     assert!(!envmnt::exists("RUSTC"));
     assert!(!envmnt::exists("RUSTDOC"));
     assert!(!envmnt::exists("RUSTFLAGS"));