vargo: Ignore empty VARGO_TOOLCHAIN

verus-lang · Nov 2, 2023 · 22394c9 · 22394c9
1 parent 9924b5d
commit 22394c9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tools/vargo/src/main.rs b/tools/vargo/src/main.rs
@@ -76,19 +76,20 @@ impl Toolchain {
     fn from_environment() -> Option<Self> {
         std::env::var("VARGO_TOOLCHAIN")
             .ok()
-            .map(|toolchain| {
+            .and_then(|toolchain| {
                 match toolchain.as_str() {
-                    "host" => Self::Host,
+                    "" => None,
+                    "host" => Some(Self::Host),
                     _ => {
                         // More relaxed than `rustup show active-toolchain`
                         let channel = toolchain.split('-').next()
                             .unwrap_or(&toolchain)
                             .to_string();
 
-                        Self::Rustup {
+                        Some(Self::Rustup {
                             toolchain,
                             channel,
-                        }
+                        })
                     }
                 }
             })