Handle $message_type in JSON diagnostics#13016
Merged
bors merged 1 commit intorust-lang:masterfrom Nov 20, 2023
Merged
Conversation
Collaborator
|
r? @ehuss (rustbot has picked a reviewer for you, use r? to override) |
Contributor
|
Thanks! @bors r+ |
Contributor
Contributor
bors
added a commit
that referenced
this pull request
Nov 20, 2023
Handle $message_type in JSON diagnostics ### What does this PR try to resolve? Unblocks rust-lang/rust#115691. Without this change, Cargo's testsuite fails in `doc::doc_message_format` and `metabuild::metabuild_failed_build_json`. ### How should we test and review this PR? Tested with and without rust-lang/rust#115691. In Cargo repo: `cargo test --test testsuite` In Rust repo: `x.py test src/tools/cargo` (separately on master and $message_type PR)
epage
reviewed
Nov 20, 2023
Comment on lines
+597
to
+601
| // Compilers older than 1.76 do not produce $message_type. | ||
| // Treat it as optional for now. | ||
| let mut expected_entries_without_message_type; | ||
| let expected_entries: &mut dyn Iterator<Item = _> = | ||
| if l.contains_key("$message_type") && !r.contains_key("$message_type") { |
Contributor
There was a problem hiding this comment.
Specializing this for the compiler runs counter to a (slow moving) effort I'm working on to use a generic, third party library rather than us using bespoke testing tools.
Member
Author
There was a problem hiding this comment.
We can delete this code as soon as Rust 1.76 is stable (February 8) and Cargo's MSRV is raised. From #12775 it looks like MSRV update is immediate upon stabilization. I have filed #13017 to follow up.
If the generic third-party library adoption proceeds faster than that, you would need to figure out how to accommodate this situation in a principled way. This will not be the last time that rustc's JSON is tweaked.
Contributor
There was a problem hiding this comment.
imo this should have been done principled before merging rather than punting that onto others.
Contributor
|
💔 Test failed - checks-actions |
Contributor
|
@bors retry issue with the ubuntu azure mirror. |
Contributor
Contributor
|
☀️ Test successful - checks-actions |
This was referenced Nov 20, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 20, 2023
Update cargo 9 commits in 9765a449d9b7341c2b49b88da41c2268ea599720..71cd3a926f0cf41eeaf9f2a7f2194b2aff85b0f6 2023-11-17 20:58:23 +0000 to 2023-11-20 15:30:57 +0000 - Handle $message_type in JSON diagnostics (rust-lang/cargo#13016) - refactor(toml): Further clean up inheritance (rust-lang/cargo#13000) - Fix `--check-cfg` invocations with zero features (rust-lang/cargo#13011) - chore: bump `cargo-credential-*` crates as e58b84d broke stuff (rust-lang/cargo#13010) - contrib docs: Update now that credential crates are published. (rust-lang/cargo#13006) - Add more resources to the contrib docs. (rust-lang/cargo#13008) - Respect `rust-lang/rust`'s `omit-git-hash` (rust-lang/cargo#12968) - Fix clippy-wrapper test race condition. (rust-lang/cargo#12999) - fix(resolver): Don't do git fetches when updating workspace members (rust-lang/cargo#12975)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
Unblocks rust-lang/rust#115691.
Without this change, Cargo's testsuite fails in
doc::doc_message_formatandmetabuild::metabuild_failed_build_json.How should we test and review this PR?
Tested with and without rust-lang/rust#115691.
In Cargo repo:
cargo test --test testsuiteIn Rust repo:
x.py test src/tools/cargo(separately on master and $message_type PR)