language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

internal: Show more project building errors to the user

Browse source
This commit is contained in:
Lukas Wirth 2022-04-11 14:38:30 +02:00
parent cf9c825c9e
commit b23b276310
8 changed files with 82 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/project_model/src/build_scripts.rs
View file

@ -7,11 +7,11 @@
//! here, but it covers procedural macros as well.
use std::{
io,
path::PathBuf,
process::{Command, Stdio},
};
use anyhow::Result;
use cargo_metadata::{camino::Utf8Path, Message};
use la_arena::ArenaMap;
use paths::AbsPathBuf;
@ -80,7 +80,7 @@ impl WorkspaceBuildScripts {
config: &CargoConfig,
workspace: &CargoWorkspace,
progress: &dyn Fn(String),
) -> Result<WorkspaceBuildScripts> {
) -> io::Result<WorkspaceBuildScripts> {
let mut cmd = Self::build_command(config);
if config.wrap_rustc_in_build_scripts {
@ -107,12 +107,12 @@ impl WorkspaceBuildScripts {
by_id.insert(workspace[package].id.clone(), package);
}
let mut callback_err = None;
let mut cfg_err = None;
let mut stderr = String::new();
let output = stdx::process::streaming_output(
cmd,
&mut |line| {
if callback_err.is_some() {
if cfg_err.is_some() {
return;
}
@ -126,7 +126,7 @@ impl WorkspaceBuildScripts {
match message {
Message::BuildScriptExecuted(message) => {
let package = match by_id.get(&message.package_id.repr) {
Some(it) => *it,
Some(&it) => it,
None => return,
};
let cfgs = {
@ -135,7 +135,7 @@ impl WorkspaceBuildScripts {
match cfg.parse::<CfgFlag>() {
Ok(it) => acc.push(it),
Err(err) => {
callback_err = Some(anyhow::format_err!(
cfg_err = Some(format!(
"invalid cfg from cargo-metadata: {}",
err
));
@ -191,6 +191,11 @@ impl WorkspaceBuildScripts {
for package in workspace.packages() {
let package_build_data = &mut res.outputs[package];
tracing::info!(
"{} BuildScriptOutput: {:?}",
workspace[package].manifest.parent().display(),
package_build_data,
);
// inject_cargo_env(package, package_build_data);
if let Some(out_dir) = &package_build_data.out_dir {
// NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
@ -200,6 +205,11 @@ impl WorkspaceBuildScripts {
}
}
if let Some(cfg_err) = cfg_err {
stderr.push_str(&cfg_err);
stderr.push('\n');
}
if !output.status.success() {
if stderr.is_empty() {
stderr = "cargo check failed".to_string();

4
crates/project_model/src/workspace.rs
View file

@ -256,7 +256,9 @@ impl ProjectWorkspace {
) -> Result<WorkspaceBuildScripts> {
match self {
ProjectWorkspace::Cargo { cargo, .. } => {
WorkspaceBuildScripts::run(config, cargo, progress)
WorkspaceBuildScripts::run(config, cargo, progress).with_context(|| {
format!("Failed to run build scripts for {}", &cargo.workspace_root().display())
})
}
ProjectWorkspace::Json { .. } | ProjectWorkspace::DetachedFiles { .. } => {
Ok(WorkspaceBuildScripts::default())