Skip to content

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

This is a temporary fix for #13880 (review), which failed due to rustc improvement rust-lang/rust#123344.

How should we test and review this PR?

I am copying cargo-test-macro without thinking too much for checking Rust channel.
Plan to reuse the infra and migrate to snapbox for rustfix tests in the future.

Additional information

@rustbot
Copy link
Collaborator

rustbot commented May 9, 2024

r? @epage

rustbot has assigned @epage.
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 Command-fix S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 9, 2024
@weihanglo
Copy link
Member Author

Note that I didn't even look into whether the unused_import lint still gave us multiple solutions.

@ehuss
Copy link
Contributor

ehuss commented May 9, 2024

Thanks!

These tests could probably use a different strategy in the future. For example, perhaps they could not run rustc if the JSON snapshot is already there. I think they only really buy us a cross-check that the compiler has not broken the JSON format, but I'm not sure that is worth it.

@bors r+

@bors
Copy link
Contributor

bors commented May 9, 2024

📌 Commit a477661 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 May 9, 2024
@bors
Copy link
Contributor

bors commented May 9, 2024

⌛ Testing commit a477661 with merge 7297f0f...

@bors
Copy link
Contributor

bors commented May 9, 2024

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 7297f0f to master...

@bors bors merged commit 7297f0f into rust-lang:master May 9, 2024
@weihanglo weihanglo deleted the rustfix branch May 9, 2024 15:02
@Noratrieb
Copy link
Member

@pietroalbini wow I can't believe you'd dare breaking cargo :(

bors added a commit to rust-lang-ci/rust that referenced this pull request May 11, 2024
Update cargo

7 commits in 0ca60e940821c311c9b25a6423b59ccdbcea218f..4de0094ac78743d2c8ff682489e35c8a7cafe8e4
2024-05-08 01:54:25 +0000 to 2024-05-09 16:09:22 +0000
- Fix docs for unstable script feature (rust-lang/cargo#13893)
- Refactor cargo lint tests (rust-lang/cargo#13880)
- test(rustfix): run some tests only on nightly (rust-lang/cargo#13890)
- Old syntax suggestion (rust-lang/cargo#13874)
- docs: clarify dash replacement rule in target name (rust-lang/cargo#13887)
- Add local-only build scripts example in check-cfg docs (rust-lang/cargo#13884)
- docs(changelog): also mention `--message-format=json` (rust-lang/cargo#13882)

r? ghost
@rustbot rustbot added this to the 1.80.0 milestone May 11, 2024
bors added a commit that referenced this pull request May 22, 2024
[beta-1.79] fix(toml): Don't warn on lints.rust.unexpected_cfgs.check-cfg

Beta backports:
- #13913 (sort of): removes just the lint warning (in a different way to be minimal) so we reduce warning noise for people using this key on nightly

In order to make CI pass, the following PRs are also cherry-picked:
- #13865
- #13834 (only `time` due to rust-lang/rust#125319)
- #13901
- #13931
- #13920
- #13890
- disable link check (not a cherry pick)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants