language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pull function out into new crate ra_env; use in ra_flycheck as well

Browse source
This commit is contained in:
Craig Disselkoen 2020-05-05 14:07:10 -07:00
parent 5aa1bba107
commit 303b444dbb
9 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/ra_project_model/src/sysroot.rs
View file

@ -1,6 +1,5 @@
//! FIXME: write short doc here
use super::find_executables::get_path_for_executable;
use anyhow::{bail, Context, Result};
use std::{
env, ops,
@ -9,6 +8,7 @@ use std::{
};
use ra_arena::{Arena, Idx};
use ra_env::get_path_for_executable;
#[derive(Default, Debug, Clone)]
pub struct Sysroot {
@ -122,7 +122,8 @@ fn get_or_install_rust_src(cargo_toml: &Path) -> Result<PathBuf> {
let src_path = sysroot_path.join("lib/rustlib/src/rust/src");
if !src_path.exists() {
run_command_in_cargo_dir(cargo_toml, "rustup", &["component", "add", "rust-src"])?;
let rustup = get_path_for_executable("rustup")?;
run_command_in_cargo_dir(cargo_toml, &rustup, &["component", "add", "rust-src"])?;
}
if !src_path.exists() {
bail!(