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(toml): Remove underscore field support in 2024 #13804

Merged
merged 6 commits into from
Apr 26, 2024

Conversation

epage
Copy link
Contributor

@epage epage commented Apr 25, 2024

What does this PR try to resolve?

This is part of the 2024 Edition and is part of rust-lang/rust#123754 and #13629

How should we test and review this PR?

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2024

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2024
@epage epage marked this pull request as draft April 25, 2024 17:24
@epage epage marked this pull request as ready for review April 25, 2024 18:22
@epage
Copy link
Contributor Author

epage commented Apr 25, 2024

... forgot to implement cargo-fix support. Should be good now.

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks!

src/cargo/util/toml/mod.rs Outdated Show resolved Hide resolved
tests/testsuite/bad_config.rs Show resolved Hide resolved
tests/testsuite/bad_config.rs Show resolved Hide resolved
src/cargo/ops/fix.rs Outdated Show resolved Hide resolved
@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 26, 2024

📌 Commit 8ab7683 has been approved by weihanglo

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 Apr 26, 2024
@bors
Copy link
Collaborator

bors commented Apr 26, 2024

⌛ Testing commit 8ab7683 with merge b60a155...

@bors
Copy link
Collaborator

bors commented Apr 26, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing b60a155 to master...

@bors bors merged commit b60a155 into rust-lang:master Apr 26, 2024
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2024
Update cargo

9 commits in c9392675917adc2edab269eea27c222b5359c637..b60a1555155111e962018007a6d0ef85207db463
2024-04-23 19:35:19 +0000 to 2024-04-26 16:37:29 +0000
- fix(toml): Remove underscore field support in 2024 (rust-lang/cargo#13804)
- fix: emit 1.77 syntax error only when msrv is incompatible (rust-lang/cargo#13808)
- docs(ref): Index differences between virtual / real manifests (rust-lang/cargo#13794)
- refactor(toml): extract dependency-to-source-id to function (rust-lang/cargo#13802)
- Add where lint was set (rust-lang/cargo#13801)
- fix(toml): Don't double-warn when underscore is used in workspace dep (rust-lang/cargo#13800)
- fix(toml): Be more forceful with underscore/dash redundancy (rust-lang/cargo#13798)
- Fix warning suppression for config.toml vs config compat symlinks (rust-lang/cargo#13793)
- Cleanup linting system (rust-lang/cargo#13797)

r? ghost
@epage epage deleted the underscore branch April 27, 2024 01:09
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2024
Update cargo

9 commits in c9392675917adc2edab269eea27c222b5359c637..b60a1555155111e962018007a6d0ef85207db463
2024-04-23 19:35:19 +0000 to 2024-04-26 16:37:29 +0000
- fix(toml): Remove underscore field support in 2024 (rust-lang/cargo#13804)
- fix: emit 1.77 syntax error only when msrv is incompatible (rust-lang/cargo#13808)
- docs(ref): Index differences between virtual / real manifests (rust-lang/cargo#13794)
- refactor(toml): extract dependency-to-source-id to function (rust-lang/cargo#13802)
- Add where lint was set (rust-lang/cargo#13801)
- fix(toml): Don't double-warn when underscore is used in workspace dep (rust-lang/cargo#13800)
- fix(toml): Be more forceful with underscore/dash redundancy (rust-lang/cargo#13798)
- Fix warning suppression for config.toml vs config compat symlinks (rust-lang/cargo#13793)
- Cleanup linting system (rust-lang/cargo#13797)

r? ghost
@rustbot rustbot added this to the 1.79.0 milestone Apr 27, 2024
guissalustiano added a commit to guissalustiano/diesel that referenced this pull request Jul 2, 2024
`dev_dependencies` is deprecated in favor of `dev-dependencies` and
will not work in the 2024 edition. [cargo #13804](rust-lang/cargo#13804)
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 Command-fix 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.

4 participants