Modify code according to comments

Cargo.toml

@@ -30,4 +30,4 @@ features = [
   "Win32_System_Threading",
   "Win32_System_WindowsProgramming",
 ]
-version = "0.52.0"
+version = "0.52.0"

src/rustup.rs

@@ -1,7 +1,9 @@
 use std::path::Path;
 
+use anyhow::{Context, Result};
+
 use crate::utils::cli::download_from_start;
-use crate::utils::{HostTriple, Process};
+use crate::utils::HostTriple;
 
 const RUSTUP_DIST_SERVER: &str = "https://mirrors.tuna.tsinghua.edu.cn/rustup";
 const RUSTUP_UPDATE_ROOT: &str = "https://mirrors.tuna.tsinghua.edu.cn/rustup/rustup";
@@ -16,8 +18,8 @@ pub struct Rustup {
 }
 
 impl Rustup {
-    pub fn new(process: &Process) -> Self {
-        let host_triple = match HostTriple::from_host(process) {
+    pub fn new() -> Self {
+        let host_triple = match HostTriple::from_host() {
             Some(host_triple) => host_triple,
             None => panic!("Failed to get local host triple."),
         };
@@ -26,15 +28,12 @@ impl Rustup {
         }
     }
 
-    pub fn download(&self, dest: &Path) {
+    pub fn download(&self, dest: &Path) -> Result<()> {
         let download_url = url::Url::parse(&format!(
             "{}/{}/{}/{}",
             RUSTUP_UPDATE_ROOT, "dist", self.triple, RUSTUP_INIT
         ))
-        .expect("Failed to init rustup download url");
-        match download_from_start(RUSTUP_INIT, &download_url, dest) {
-            Ok(_) => (),
-            Err(e) => panic!("Failed to download rustup, cause: {:?}", e),
-        }
+        .context("Failed to init rustup download url")?;
+        download_from_start(RUSTUP_INIT, &download_url, dest).context("Failed to download rustup")
     }
 }

src/utils/process.rs

@@ -1,4 +1,3 @@
-use std::env;
 use std::ffi::OsStr;
 use std::io::Write;
 use std::process::{Command, Output};
@@ -83,20 +82,3 @@ pub fn forward_output(output: Output) -> Result<()> {
     std::io::stderr().write_all(&output.stderr)?;
     Ok(())
 }
-
-#[derive(Clone, Debug)]
-pub enum Process {
-    OsProcess,
-}
-
-impl Process {
-    pub fn os() -> Self {
-        Self::OsProcess
-    }
-
-    pub fn var(&self, key: &str) -> Result<String, env::VarError> {
-        match self {
-            Process::OsProcess => env::var(key),
-        }
-    }
-}

src/utils/triple.rs

@@ -1,6 +1,4 @@
-use std::{fmt, ops::Deref};
-
-use crate::utils::Process;
+use std::{env, fmt, ops::Deref};
 
 // Linux hosts don't indicate clib in uname, however binaries only
 // run on boxes with the same clib, as expected.
@@ -39,7 +37,7 @@ impl HostTriple {
         Self(name.into())
     }
 
-    pub(crate) fn from_host(process: &Process) -> Option<Self> {
+    pub(crate) fn from_host() -> Option<Self> {
         #[cfg(windows)]
         fn inner() -> Option<HostTriple> {
             use std::mem;
@@ -156,7 +154,7 @@ impl HostTriple {
             host_triple.map(HostTriple::new)
         }
 
-        if let Ok(triple) = process.var("XUANWU_OVERRIDE_HOST_TRPLE") {
+        if let Ok(triple) = env::var("XUANWU_OVERRIDE_HOST_TRPLE") {
             Some(Self(triple))
         } else {
             inner()