[beta-1.77] Backport ignore cargo::rustc-check-cfg
#13500
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Silently ignore `cargo::rustc-check-cfg` to avoid MSRV annoyance when stabilizing `-Zcheck-cfg` This PR, removes the warning when trying to use `cargo::rustc-check-cfg` on stable or nightly (without the nightly-only `-Zcheck-cfg` flag) to avoid MSRV annoyance when stabilizing `-Zcheck-cfg`. See this [Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/check-cfg.20backwards.20compatible.20warnings) for more information and context. cc `@ehuss`
Remove unnecessary `use` statement in metabuild Check this situation in PR [#117772](rust-lang/rust#117772) in rustc. This blocks the merge of that PR. Details in [CI log](https://github.com/rust-lang-ci/rust/actions/runs/7886502990/job/21519873414). ```bash 2024-02-13T13:22:45.9857459Z failures: 2024-02-13T13:22:45.9857706Z 2024-02-13T13:22:45.9858644Z ---- metabuild::metabuild_fresh stdout ---- 2024-02-13T13:22:45.9881590Z running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo check -vv` 2024-02-13T13:22:45.9883611Z running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo check -vv` 2024-02-13T13:22:45.9884693Z thread 'metabuild::metabuild_fresh' panicked at tests/testsuite/metabuild.rs:284:10: 2024-02-13T13:22:45.9885493Z �[1m�[31merror�[0m�[1m:�[0m test failed, to rerun pass `--test testsuite` 2024-02-13T13:22:45.9885887Z 2024-02-13T13:22:45.9886990Z test failed running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo check -vv` 2024-02-13T13:22:45.9888275Z error: stderr did not match: 2024-02-13T13:22:45.9888777Z 1 1 Fresh mb [..] 2024-02-13T13:22:45.9889189Z 2 +warning: the item `mb` is imported redundantly 2024-02-13T13:22:45.9889820Z 3 + --> target/.metabuild/metabuild-foo-0e2ce73c8cda338a.rs:1:5 2024-02-13T13:22:45.9890297Z 4 + | 2024-02-13T13:22:45.9890545Z 5 +1 | use mb; 2024-02-13T13:22:45.9890899Z 6 + | ^^ the item `mb` is already defined here 2024-02-13T13:22:45.9891299Z 7 + | 2024-02-13T13:22:45.9891623Z 8 + = note: `#[warn(unused_imports)]` on by default 2024-02-13T13:22:45.9927602Z 9 + 2024-02-13T13:22:45.9928248Z 10 +warning: `foo` (build script) generated 1 warning 2024-02-13T13:22:45.9930583Z 2 11 Fresh foo [..] 2024-02-13T13:22:45.9931176Z 3 12 Finished `dev` profile [..] 2024-02-13T13:22:45.9931653Z 2024-02-13T13:22:45.9931665Z 2024-02-13T13:22:45.9932104Z other output: 2024-02-13T13:22:45.9932291Z 2024-02-13T13:22:45.9932297Z 2024-02-13T13:22:45.9932309Z 2024-02-13T13:22:45.9932316Z 2024-02-13T13:22:45.9932417Z failures: 2024-02-13T13:22:45.9932695Z metabuild::metabuild_fresh ```
Collaborator
Collaborator
|
rustbot
added
A-build-scripts
weihanglo
approved these changes
Feb 29, 2024
Member
|
Thanks! @bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 1, 2024
…nglo [beta-1.77.0] backport cargo 1 commits in 837c09f04022352c26cf445f37492709922b24ef..3fe68eabf93cbf3772bbcad09a9206c783e2de3f 2024-02-16 20:47:59 +0000 to 2024-02-29 00:16:03 +0000 - [beta-1.77] Backport ignore `cargo::rustc-check-cfg` (rust-lang/cargo#13500)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a beta backport of #13438 (comment) to disable the warning when
cargo::rustc-check-cfgis used in a build script on stable in order to provide a broader window where we can stabilize check-cfg, and allow developers to avoid the warning when they use a range of different Rust versions (such as stable and nightly).Also backports to fix CI:
usestatement in metabuild #13455 — Remove unnecessary use statement in metabuild