[beta-1.77.0] Fix panic on empty spans when parsing Cargo.toml #13393
+45
−12
Conversation
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
fix(diagnostic): Don't panic on empty spans ### What does this PR try to resolve? There is another level to this bug where we better point to where the error occurs, see toml-rs/toml#669. Fixes rust-lang#13374 ### How should we test and review this PR? ### Additional information
fix(toml): Improve map/sequence error message This is a follow up to rust-lang#13375
Collaborator
|
r? @epage (rustbot has picked a reviewer for you, use r? to override) |
Collaborator
|
rustbot
added
A-manifest
Contributor
|
Thanks! @bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
epage
added a commit
to epage/cargo
that referenced
this pull request
Feb 5, 2024
The fix was backported to 1.77 (rust-lang#13393) which is when it got introduced (rust-lang#13172).
bors
added a commit
that referenced
this pull request
Feb 5, 2024
docs(changelog): Slight cleanup ### What does this PR try to resolve? For strip, I felt the nuance of where this change applies isn't as obvious and might give people the wrong impression, so I tried to make that front and center. For the panic, the fix was backported to 1.77 (#13393) which is when it got introduced (#13172). ### How should we test and review this PR? ### Additional information
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 9, 2024
…nglo [beta-1.77.0] backport cargo 2 commits in 7bb7b539558dc88bea44cee4168b6269bf8177b0..c8a48facdaabe1d1fa8de11f90737801f38d8fa1 2024-01-20 00:15:32 +0000 to 2024-02-07 19:15:46 +0000 - [Beta-1.77] Update libgit2 (rust-lang/cargo#13417) - [beta-1.77.0] Fix panic on empty spans when parsing Cargo.toml (rust-lang/cargo#13393)
stupendoussuperpowers
pushed a commit
to stupendoussuperpowers/cargo
that referenced
this pull request
Feb 28, 2024
The fix was backported to 1.77 (rust-lang#13393) which is when it got introduced (rust-lang#13172).
charmitro
pushed a commit
to charmitro/cargo
that referenced
this pull request
Sep 13, 2024
The fix was backported to 1.77 (rust-lang#13393) which is when it got introduced (rust-lang#13172).
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.
Beta backports:
In order to make CI pass, the following PRs are also cherry-picked:
x86_64-unknown-none-gnu#13362