From e29dbdb139fb3a35902b4b3d11a92d45861d210b Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 18 Feb 2020 00:38:01 +0200 Subject: Simplify the command execution --- crates/ra_project_model/src/sysroot.rs | 62 +++++++++++++++------------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs index b426fc107..db779a2d2 100644 --- a/crates/ra_project_model/src/sysroot.rs +++ b/crates/ra_project_model/src/sysroot.rs @@ -4,7 +4,7 @@ use anyhow::{bail, Context, Result}; use std::{ env, path::{Path, PathBuf}, - process::Command, + process::{Command, Output}, }; use ra_arena::{impl_arena_id, Arena, RawId}; @@ -79,49 +79,43 @@ impl Sysroot { } } -fn get_or_install_rust_src(cargo_toml: &Path) -> Result { - fn try_install_rust_src(cargo_toml: &Path) -> Result<()> { - let rustup_output = Command::new("rustup") - .current_dir(cargo_toml.parent().unwrap()) - .args(&["component", "add", "rust-src"]) - .output() - .context("rustup component add rust-src failed")?; - if !rustup_output.status.success() { - match rustup_output.status.code() { - Some(code) => bail!( - "failed to install rust-src: rustup component add rust-src exited with code {}", - code - ), - None => bail!( - "failed to install rust-src: rustup component add rust-src terminated by signal" - ), - }; - } - Ok(()) - } +fn create_command_text(program: &str, args: &[&str]) -> String { + format!("{} {}", program, args.join(" ")) +} - if let Ok(path) = env::var("RUST_SRC_PATH") { - return Ok(path.into()); - } - let rustc_output = Command::new("rustc") +fn run_command_in_cargo_dir(cargo_toml: &Path, program: &str, args: &[&str]) -> Result { + let output = Command::new(program) .current_dir(cargo_toml.parent().unwrap()) - .args(&["--print", "sysroot"]) + .args(args) .output() - .context("rustc --print sysroot failed")?; - if !rustc_output.status.success() { - match rustc_output.status.code() { - Some(code) => { - bail!("failed to locate sysroot: rustc --print sysroot exited with code {}", code) - } - None => bail!("failed to locate sysroot: rustc --print sysroot terminated by signal"), + .context(format!("{} failed", create_command_text(program, args)))?; + if !output.status.success() { + match output.status.code() { + Some(code) => bail!( + "failed to run the command: '{}' exited with code {}", + create_command_text(program, args), + code + ), + None => bail!( + "failed to run the command: '{}' terminated by signal", + create_command_text(program, args) + ), }; } + Ok(output) +} + +fn get_or_install_rust_src(cargo_toml: &Path) -> Result { + if let Ok(path) = env::var("RUST_SRC_PATH") { + return Ok(path.into()); + } + let rustc_output = run_command_in_cargo_dir(cargo_toml, "rustc", &["--print", "sysroot"])?; let stdout = String::from_utf8(rustc_output.stdout)?; let sysroot_path = Path::new(stdout.trim()); let src_path = sysroot_path.join("lib/rustlib/src/rust/src"); if !src_path.exists() { - try_install_rust_src(cargo_toml)? + run_command_in_cargo_dir(cargo_toml, "rustup", &["component", "add", "rust-src"])?; } if !src_path.exists() { bail!( -- cgit v1.2.3