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(diagnostic): Don't panic on empty spans #13375

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Conversation

epage
Copy link
Contributor

@epage epage commented Jan 31, 2024

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 #13374

How should we test and review this PR?

Additional information

There is another level to this bug where we better point to where the
error occurs.
@rustbot
Copy link
Collaborator

rustbot commented Jan 31, 2024

r? @weihanglo

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

@rustbot rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 31, 2024
@Muscraft
Copy link
Member

Feel free to r me when CI finishes

@Muscraft
Copy link
Member

@bors r

@bors
Copy link
Collaborator

bors commented Jan 31, 2024

📌 Commit 1c05d41 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 Jan 31, 2024
@bors
Copy link
Collaborator

bors commented Jan 31, 2024

⌛ Testing commit 1c05d41 with merge 0f37cfb...

@bors
Copy link
Collaborator

bors commented Jan 31, 2024

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

1 similar comment
@bors
Copy link
Collaborator

bors commented Jan 31, 2024

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

@bors bors merged commit 0f37cfb into rust-lang:master Jan 31, 2024
20 checks passed
@bors
Copy link
Collaborator

bors commented Jan 31, 2024

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

epage added a commit to epage/cargo that referenced this pull request Jan 31, 2024
epage added a commit to epage/cargo that referenced this pull request Jan 31, 2024
bors added a commit that referenced this pull request Jan 31, 2024
fix(toml): Improve map/sequence error message

This is a follow up to #13375
weihanglo pushed a commit to weihanglo/cargo that referenced this pull request Feb 4, 2024
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
weihanglo pushed a commit to weihanglo/cargo that referenced this pull request Feb 4, 2024
fix(toml): Improve map/sequence error message

This is a follow up to rust-lang#13375
bors added a commit that referenced this pull request Feb 4, 2024
[beta-1.77.0] Fix panic on empty spans when parsing Cargo.toml

Beta backports:

- <#13375>
- <#13376>

In order to make CI pass, the following PRs are also cherry-picked:

- <#13362>
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 5, 2024
Update cargo

24 commits in 7bb7b539558dc88bea44cee4168b6269bf8177b0..cdf84b69d0416c57ac9dc3459af80dfb4883d27a
2024-01-20 00:15:32  0000 to 2024-02-02 19:39:16  0000
- Apply `-Zpanic-abort-tests` to doctests too (rust-lang/cargo#13388)
- Don't print rustdoc command lines on failure by default (rust-lang/cargo#13387)
- Ensure `nonzero_exit_code` test isn't affected by developers `RUST_BACKTRACE` setting (rust-lang/cargo#13385)
- Add `docsrs` cfg as a well known `--check-cfg` (rust-lang/cargo#13383)
- fix(new): Print a note, rather than a comment, for more information (rust-lang/cargo#13371)
- Change tests to support changes to suggestion (rust-lang/cargo#13382)
- chore(ci): enable m1 runner (rust-lang/cargo#13377)
- fix(toml): Improve map/sequence error message (rust-lang/cargo#13376)
- fix(diagnostic): Don't panic on empty spans (rust-lang/cargo#13375)
- doc: Hide `cargo-fetch` description in offline man page (rust-lang/cargo#13364)
- feat: stabilize lockfile v4 (rust-lang/cargo#12852)
- fix(new): Print a 'Creating', rather than 'Created' status (rust-lang/cargo#13367)
- fix: use spec id instead of name to match package (rust-lang/cargo#13335)
- refactor(shell): Use new fancy anstyle API (rust-lang/cargo#13368)
- feat(cargo-update): `--precise` to allow yanked versions (rust-lang/cargo#13333)
- refactor: remove unnecessary Option in `Freshness::Dirty` (rust-lang/cargo#13361)
- doc: Replace version with `latest` for jobserver link (rust-lang/cargo#13366)
- test: data layout fix for `x86_64-unknown-none-gnu` (rust-lang/cargo#13362)
- docs(ref): Try to improve reg auth docs (rust-lang/cargo#13351)
- fix typo of rustbuild, instead of rustuild (rust-lang/cargo#13357)
- fix(config): Deprecate non-extension files (rust-lang/cargo#13349)
- fix(cli): Improve errors related to cargo script (rust-lang/cargo#13346)
- fix list option description starting with uppercase (rust-lang/cargo#13344)
- Fix typo in test (rust-lang/cargo#13342)
@rustbot rustbot added this to the 1.78.0 milestone Feb 5, 2024
@epage epage deleted the panic branch February 5, 2024 15:47
@rustbot rustbot modified the milestones: 1.78.0, 1.77.0 Feb 9, 2024
stupendoussuperpowers pushed a commit to stupendoussuperpowers/cargo that referenced this pull request Feb 28, 2024
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.

OOB string indexing panic with incorrect Cargo.toml
5 participants