diff --git a/src/toolchain/rust.rs b/src/toolchain/rust.rs index 20586af..eb0d9c4 100644 --- a/src/toolchain/rust.rs +++ b/src/toolchain/rust.rs @@ -237,7 +237,10 @@ impl Crate { } pub fn uninstall(extra_crate: &str) -> Result<(), Error> { - cmd!("cargo", "uninstall", extra_crate).run()?; + cmd!("cargo", "uninstall", extra_crate) + .into_inner() + .stdout(Stdio::null()) + .spawn()?; Ok(()) } } @@ -255,7 +258,10 @@ impl Installable for Crate { if PathBuf::from(crate_path).exists() { warn!("{} {} is already installed", emoji::WARN, self.name); } else { - cmd!("cargo", "install", &self.name).run()?; + cmd!("cargo", "install", &self.name) + .into_inner() + .stdout(Stdio::null()) + .spawn()?; } Ok(vec![]) // No exports @@ -287,7 +293,9 @@ impl RiscVTarget { "riscv32imc-unknown-none-elf", "riscv32imac-unknown-none-elf" ) - .run()?; + .into_inner() + .stdout(Stdio::null()) + .spawn()?; Ok(()) } } @@ -424,7 +432,9 @@ async fn install_rustup(nightly_version: &str, host_triple: &HostTriple) -> Resu "minimal", "-y" ) - .run()?; + .into_inner() + .stdout(Stdio::null()) + .spawn()?; #[cfg(not(windows))] cmd!( "/bin/bash", @@ -437,7 +447,9 @@ async fn install_rustup(nightly_version: &str, host_triple: &HostTriple) -> Resu "minimal", "-y" ) - .run()?; + .into_inner() + .stdout(Stdio::null()) + .spawn()?; #[cfg(windows)] let path = format!( @@ -462,7 +474,7 @@ async fn install_rustup(nightly_version: &str, host_triple: &HostTriple) -> Resu } /// Installs the desired version of the nightly toolchain. -fn install_rust_nightly(version: &str) -> Result<()> { +fn install_rust_nightly(version: &str) -> Result<(), Error> { info!("{} Installing {} toolchain", emoji::WRENCH, version); cmd!( "rustup", @@ -472,8 +484,9 @@ fn install_rust_nightly(version: &str) -> Result<()> { "--profile", "minimal" ) - .run() - .into_diagnostic()?; + .into_inner() + .stdout(Stdio::null()) + .spawn()?; Ok(()) }