development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-09-28 20:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct error count for cargo check --message-format json

Browse source
This commit is contained in:
yichi170 2024-09-26 23:07:44 -05:00
parent 01e1ab55dd
commit 71c830ccef
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cargo/core/compiler/mod.rs
View file

@ -1867,10 +1867,19 @@ fn on_stderr_line_inner(
#[derive(serde::Deserialize)]
struct CompilerMessage {
message: String,
level: String,
}
if let Ok(message) = serde_json::from_str::<CompilerMessage>(compiler_message.get()) {
count_diagnostic(&message.level, options);
if let Ok(msg) = serde_json::from_str::<CompilerMessage>(compiler_message.get()) {
if msg.message.starts_with("aborting due to")
|| msg.message.ends_with("warning emitted")
|| msg.message.ends_with("warnings emitted")
{
// Skip this line; we'll print our own summary at the end.
return Ok(true);
}
count_diagnostic(&msg.level, options);
}
let msg = machine_message::FromCompiler {

2
tests/testsuite/build.rs
View file

@ -95,7 +95,7 @@ fn cargo_fail_with_no_stderr() {
.with_status(101)
.with_stderr_data(str![[r#"
[COMPILING] foo v0.5.0 ([ROOT]/foo)
[ERROR] could not compile `foo` (bin "foo") due to 2 previous errors
[ERROR] could not compile `foo` (bin "foo") due to 1 previous error
"#]])
.run();

6
tests/testsuite/pkgid.rs
View file

@ -327,12 +327,6 @@ fn pkgid_json_message_metadata_consistency() {
"reason": "compiler-message",
"...": "{...}"
},
{
"manifest_path": "[ROOT]/foo/Cargo.toml",
"package_id": "path+[ROOTURL]/foo#0.5.0",
"reason": "compiler-message",
"...": "{...}"
},
{
"manifest_path": "[ROOT]/foo/Cargo.toml",
"package_id": "path+[ROOTURL]/foo#0.5.0",