Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failure to parse rustc's JSON output if it is too nested #11368

Merged
merged 1 commit into from
Nov 22, 2022

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Nov 13, 2022

What does this PR try to resolve?

The structure of rustc's JSON outputs is recursive. See https://docs.rs/rustfix/0.6.1/rustfix/diagnostics/struct.Diagnostic.html which has a field children: Vec<Self>. When macros are involved, this output can end up getting arbitrarily deeply nested, and eventually causes Cargo to fail to parse it. In this situation Cargo will just dump the entire unformatted JSON output through to stderr instead of a rendered diagnostic.

This PR makes Cargo able to safely pick out a rendered diagnostic from arbitrarily deeply nested rustc JSONs.

How should we test and review this PR?

$ rustup toolchain install nightly-2022-11-13 --component rustc-dev
$ git clone https://github.com/dtolnay/syn
$ cd syn/
$ git checkout 4c0ddcc84ce51a84b57ce54fcfda8893f67dd4a1
$ RUSTC=$(rustup +nightly-2022-11-13 which rustc) /path/to/cargo/target/release/cargo check --all-features --test test_round_trip

Before: 335 Kilobytes of unformatted JSON

After: rendered diagnostic as expected.

@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2022

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2022
src/cargo/core/compiler/mod.rs Show resolved Hide resolved
@weihanglo
Copy link
Member

@bors r=Muscraft

@bors
Copy link
Collaborator

bors commented Nov 22, 2022

📌 Commit 9d7a3b2 has been approved by Muscraft

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 22, 2022
@bors
Copy link
Collaborator

bors commented Nov 22, 2022

⌛ Testing commit 9d7a3b2 with merge ba607b2...

@bors
Copy link
Collaborator

bors commented Nov 22, 2022

☀️ Test successful - checks-actions
Approved by: Muscraft
Pushing ba607b2 to master...

@bors bors merged commit ba607b2 into rust-lang:master Nov 22, 2022
@dtolnay dtolnay deleted the partial branch November 22, 2022 22:55
weihanglo added a commit to weihanglo/rust that referenced this pull request Nov 23, 2022
7 commits in eb5d35917b2395194593c9ca70c3778f60c1573b..ba607b23db8398723d659249d9abf5536bc322e5
2022-11-17 22:08:43 +0000 to 2022-11-22 20:52:39 +0000

- Fix failure to parse rustc's JSON output if it is too nested (rust-lang/cargo#11368)
- Add suggestions when `cargo add` multiple packages (rust-lang/cargo#11186)
- Update mod.rs (rust-lang/cargo#11395)
- Fix typo `try use` -> `try to use` (rust-lang/cargo#11394)
- Add warning when `cargo tree -i <spec>` can not find packages (rust-lang/cargo#11377)
- Clean profile, patch, and replace in cargo remove (rust-lang/cargo#11194)
- chore: Upgrade miow (rust-lang/cargo#11391)
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 23, 2022
Update cargo

7 commits in eb5d35917b2395194593c9ca70c3778f60c1573b..ba607b23db8398723d659249d9abf5536bc322e5 2022-11-17 22:08:43 +0000 to 2022-11-22 20:52:39 +0000

- Fix failure to parse rustc's JSON output if it is too nested (rust-lang/cargo#11368)
- Add suggestions when `cargo add` multiple packages (rust-lang/cargo#11186)
- Update mod.rs (rust-lang/cargo#11395)
- Fix typo `try use` -> `try to use` (rust-lang/cargo#11394)
- Add warning when `cargo tree -i <spec>` can not find packages (rust-lang/cargo#11377)
- Clean profile, patch, and replace in cargo remove (rust-lang/cargo#11194)
- chore: Upgrade miow (rust-lang/cargo#11391)
@ehuss ehuss added this to the 1.67.0 milestone Dec 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants