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

[beta-1.77.0] Fix panic on empty spans when parsing Cargo.toml #13393

Merged
merged 3 commits into from
Feb 4, 2024

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Feb 4, 2024

bors added 2 commits February 4, 2024 11:49
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
@rustbot
Copy link
Collaborator

rustbot commented Feb 4, 2024

r? @epage

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

@rustbot
Copy link
Collaborator

rustbot commented Feb 4, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.77.0. Please double check that you specified the right target!

@rustbot rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 4, 2024
@ehuss
Copy link
Contributor

ehuss commented Feb 4, 2024

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Feb 4, 2024

📌 Commit d1751e0 has been approved by ehuss

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 Feb 4, 2024
@bors
Copy link
Contributor

bors commented Feb 4, 2024

⌛ Testing commit d1751e0 with merge 9075a2c...

@bors
Copy link
Contributor

bors commented Feb 4, 2024

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 9075a2c to rust-1.77.0...

@bors bors merged commit 9075a2c into rust-lang:rust-1.77.0 Feb 4, 2024
22 checks passed
@weihanglo weihanglo deleted the beta-backport branch February 4, 2024 21:11
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)
@rustbot rustbot added this to the 1.77.0 milestone Feb 9, 2024
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
Labels
A-manifest Area: Cargo.toml issues 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.

5 participants