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

Add error context to failures in ra_project_model using anyhow crate (#3119)

Browse source 
Add error context to failures in ra_project_model using anyhow crate
This commit is contained in:
Adam Bratschi-Kaye 2020-02-13 11:10:50 +01:00 • committed by GitHub
parent 39abac8c91
commit 6f2cab1368
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
//! FIXME: write short doc here
use anyhow::{anyhow, bail, Context, Result};
use std::{
env,
path::{Path, PathBuf},
@ -8,8 +9,6 @@ use std::{
use ra_arena::{impl_arena_id, Arena, RawId};
use crate::Result;
#[derive(Default, Debug, Clone)]
pub struct Sysroot {
crates: Arena<SysrootCrate, SysrootCrateData>,
@ -51,7 +50,7 @@ impl Sysroot {
let src = try_find_src_path(cargo_toml)?;
if !src.exists() {
Err(format!(
Err(anyhow!(
"can't load standard library from sysroot\n\
{}\n\
(discovered via `rustc --print sysroot`)\n\
@ -100,9 +99,14 @@ fn try_find_src_path(cargo_toml: &Path) -> Result<PathBuf> {
.current_dir(cargo_toml.parent().unwrap())
.args(&["--print", "sysroot"])
.output()
.map_err(|e| format!("rustc --print sysroot failed: {}", e))?;
.context("rustc --print sysroot failed")?;
if !rustc_output.status.success() {
Err("failed to locate sysroot")?;
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"),
};
}
let stdout = String::from_utf8(rustc_output.stdout)?;
let sysroot_path = Path::new(stdout.trim());