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.

Sign up for GitHub

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

Jump to bottom

fix(toml): Be more forceful with underscore/dash redundancy #13798

Merged
merged 1 commit into from
Apr 24, 2024
Merged

fix(toml): Be more forceful with underscore/dash redundancy #13798

merged 1 commit into from
Apr 24, 2024

Conversation

epage
Copy link
Contributor

@epage epage commented Apr 24, 2024 •
edited

What does this PR try to resolve?

This is prep for removing them in the 2024 Edition and is part of rust-lang/rust#123754 and #13629

During #13783, I had considered making the 2024 edition behavior a "unused key" warning. However, the work and code mess to pipe the data through correctly handle the two fields in all cases didn't seem worth it (and a hard error might be better to help users transition).

How should we test and review this PR?

Additional information

@epage
fix(toml): Be more forceful with underscore/dash redundancy
034ef3c 
During rust-lang#13783, I had considered making the 2024 edition behavior a
"unused key" warning.  However, I'm being too lazy in piping the data
through correctly (and a hard error might be better to help users
transition).
@rustbot
Copy link
Collaborator

rustbot commented Apr 24, 2024

r? @ehuss

rustbot has assigned @ehuss.
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 24, 2024
@epage
Copy link
Contributor Author

epage commented Apr 24, 2024

Odd failure I can't reproduce locally

---- global_cache_tracker::max_download_size stdout ----
running `/home/runner/work/cargo/cargo/target/debug/cargo clean gc -Zgc -v --max-download-size=30`
running `/home/runner/work/cargo/cargo/target/debug/cargo clean gc -Zgc -v --max-download-size=29`
running `/home/runner/work/cargo/cargo/target/debug/cargo clean gc -Zgc -v --max-download-size=24`
running `/home/runner/work/cargo/cargo/target/debug/cargo clean gc -Zgc -v --max-download-size=20`
running `/home/runner/work/cargo/cargo/target/debug/cargo clean gc -Zgc -v --max-download-size=1`
thread 'global_cache_tracker::max_download_size' panicked at tests/testsuite/global_cache_tracker.rs:1138:14:

test failed running `/home/runner/work/cargo/cargo/target/debug/cargo clean gc -Zgc -v --max-download-size=1`
error: Expected lines did not match (ignoring order):
0   1         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/src/example.com-a6c4a5adcb232b9a/d-1.0.0
1   4         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/cache/example.com-a6c4a5adcb232b9a/d-1.0.0.crate
2   1         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/src/example.com-a6c4a5adcb232b9a/c-1.0.0
3   3         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/cache/example.com-a6c4a5adcb232b9a/c-1.0.0.crate
4   1         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/src/example.com-a6c4a5adcb232b9a/a-1.0.0
5   2         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/cache/example.com-a6c4a5adcb232b9a/a-1.0.0.crate
6   1         Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/src/example.com-a6c4a5adcb232b9a/b-1.0.0
7        -     Removed 7 files, 29B total
    7    +     Removed 8 files, 30B total
    8    +    Removing /home/runner/work/cargo/cargo/target/tmp/cit/t1586/home/.cargo/registry/cache/example.com-a6c4a5adcb232b9a/b-1.0.0.crate

weihanglo
weihanglo approved these changes Apr 24, 2024
View reviewed changes
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 nicer!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 24, 2024

📌 Commit 034ef3c 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 24, 2024
@bors
Copy link
Collaborator

bors commented Apr 24, 2024

⌛ Testing commit 034ef3c with merge e3d42b6...

@bors
Copy link
Collaborator

bors commented Apr 24, 2024

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

@bors bors merged commit e3d42b6 into rust-lang:master Apr 24, 2024
21 checks passed
@epage epage deleted the underscore branch April 24, 2024 20:36
@epage epage mentioned this pull request Apr 24, 2024
Merged
This was referenced Apr 25, 2024
Merged
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2024
@bors
Auto merge of rust-lang#124416 - weihanglo:update-cargo, r=weihanglo
f4e8df4 
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
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2024
@bors
Auto merge of rust-lang#124416 - weihanglo:update-cargo, r=weihanglo
9ac33d9 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@ehuss ehuss

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
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@epage @rustbot @weihanglo @bors @ehuss