From 43f81156e21b4844b8a20a463c82722376944b58 Mon Sep 17 00:00:00 2001 From: Francisco Gouveia Date: Mon, 21 Jul 2025 15:18:42 +0100 Subject: [PATCH] fix(update_root): fallback to default update root if passed root is empty --- src/cli/self_update.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/cli/self_update.rs b/src/cli/self_update.rs index a9dc44ce20..916337eddc 100644 --- a/src/cli/self_update.rs +++ b/src/cli/self_update.rs @@ -472,10 +472,16 @@ This will uninstall all Rust toolchains and data, and remove static DEFAULT_UPDATE_ROOT: &str = "https://static.rust-lang.org/rustup"; fn update_root(process: &Process) -> String { - process - .var("RUSTUP_UPDATE_ROOT") - .inspect(|url| trace!("`RUSTUP_UPDATE_ROOT` has been set to `{url}`")) - .unwrap_or_else(|_| String::from(DEFAULT_UPDATE_ROOT)) + match non_empty_env_var("RUSTUP_UPDATE_ROOT", process) + .ok() + .flatten() + { + Some(url) => { + trace!("`RUSTUP_UPDATE_ROOT` has been set to `{url}`"); + url + } + None => String::from(DEFAULT_UPDATE_ROOT), + } } /// `CARGO_HOME` suitable for display, possibly with $HOME