refactor(config): extract dist_root_server()

Author: rami3l

src/config.rs

@@ -297,24 +297,7 @@ impl<'a> Cfg<'a> {
             .map(|t| t.resolve(&default_host_triple))
             .transpose()?;
 
-        let dist_root_server = match process.var("RUSTUP_DIST_SERVER") {
-            Ok(s) if !s.is_empty() => {
-                trace!("`RUSTUP_DIST_SERVER` has been set to `{s}`");
-                s
-            }
-            _ => {
-                // For backward compatibility
-                process
-                    .var("RUSTUP_DIST_ROOT")
-                    .ok()
-                    .and_then(utils::if_not_empty)
-                    .inspect(|url| trace!("`RUSTUP_DIST_ROOT` has been set to `{url}`"))
-                    .map_or(Cow::Borrowed(dist::DEFAULT_DIST_ROOT), Cow::Owned)
-                    .as_ref()
-                    .trim_end_matches("/dist")
-                    .to_owned()
-            }
-        };
+        let dist_root_server = dist_root_server(process);
 
         let notify_clone = notify_handler.clone();
         let tmp_cx = temp::Context::new(
@@ -957,6 +940,27 @@ impl<'a> Cfg<'a> {
     }
 }
 
+fn dist_root_server(process: &Process) -> String {
+    match process.var("RUSTUP_DIST_SERVER") {
+        Ok(s) if !s.is_empty() => {
+            trace!("`RUSTUP_DIST_SERVER` has been set to `{s}`");
+            s
+        }
+        _ => {
+            // For backward compatibility
+            process
+                .var("RUSTUP_DIST_ROOT")
+                .ok()
+                .and_then(utils::if_not_empty)
+                .inspect(|url| trace!("`RUSTUP_DIST_ROOT` has been set to `{url}`"))
+                .map_or(Cow::Borrowed(dist::DEFAULT_DIST_ROOT), Cow::Owned)
+                .as_ref()
+                .trim_end_matches("/dist")
+                .to_owned()
+        }
+    }
+}
+
 impl<'a> Debug for Cfg<'a> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let Self {