user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

symcheck: Improve diagnostics from spawned Cargo

Browse source 
Rather than printing the entire JSON dump, use the rendered version.
This commit is contained in:
Trevor Gross 2025-07-04 18:10:27 -05:00
parent e164811f5d
commit 84060f608b
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
library/compiler-builtins/crates/symbol-check/src/main.rs
View file

@ -87,9 +87,14 @@ fn host_target() -> String {
/// libraries.
fn exec_cargo_with_args(target: &str, args: &[&str]) -> Vec<PathBuf> {
let mut cmd = Command::new("cargo");
cmd.args(["build", "--target", target, "--message-format=json"])
.args(args)
.stdout(Stdio::piped());
cmd.args([
"build",
"--target",
target,
"--message-format=json-diagnostic-rendered-ansi",
])
.args(args)
.stdout(Stdio::piped());
println!("running: {cmd:?}");
let mut child = cmd.spawn().expect("failed to launch Cargo");
@ -100,11 +105,21 @@ fn exec_cargo_with_args(target: &str, args: &[&str]) -> Vec<PathBuf> {
for line in reader.lines() {
let line = line.expect("failed to read line");
println!("{line}"); // tee to stdout
// Select only steps that create files
let j: Value = serde_json::from_str(&line).expect("failed to deserialize");
if j["reason"] != "compiler-artifact" {
let reason = &j["reason"];
// Forward output that is meant to be user-facing
if reason == "compiler-message" {
println!("{}", j["message"]["rendered"].as_str().unwrap());
} else if reason == "build-finished" {
println!("build finshed. success: {}", j["success"]);
} else if reason == "build-script-executed" {
let pretty = serde_json::to_string_pretty(&j).unwrap();
println!("build script output: {pretty}",);
}
// Only interested in the artifact list now
if reason != "compiler-artifact" {
continue;
}