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

Remove unnecessary use statement in metabuild #13455

Merged
merged 1 commit into from
Feb 17, 2024

Conversation

surechen
Copy link
Contributor

@surechen surechen commented Feb 17, 2024

Check this situation in PR #117772 in rustc.

This blocks the merge of that PR. Details in CI log.

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

Check this in PR #117772 in rustc.
@rustbot
Copy link
Collaborator

rustbot commented Feb 17, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @epage (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added A-build-scripts Area: build.rs scripts S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 17, 2024
@weihanglo weihanglo changed the title Remove unnecessary use mb; in metebuild. Remove unnecessary use statement in metabuild Feb 17, 2024
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.

Yeah. They don't seem necessary. Thanks for the contribution!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 17, 2024

📌 Commit 8100d27 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 Feb 17, 2024
@bors
Copy link
Collaborator

bors commented Feb 17, 2024

⌛ Testing commit 8100d27 with merge 7b7af30...

@bors
Copy link
Collaborator

bors commented Feb 17, 2024

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

@bors bors merged commit 7b7af30 into rust-lang:master Feb 17, 2024
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 18, 2024
Update cargo

12 commits in fc1d58fd0531a57a6b942a14cdcdbcb82ece16f3..7b7af3077bff8d60b7f124189bc9de227d3063a9
2024-02-09 15:54:29 +0000 to 2024-02-17 14:13:00 +0000
- Remove unnecessary `use` statement in metabuild (rust-lang/cargo#13455)
- chore: Update snapbox (rust-lang/cargo#13441)
- chore(deps): update openssl to 3.2.1 again (rust-lang/cargo#13449)
- fix(test): Suggest `--` for libtest arguments (rust-lang/cargo#13448)
- chore(ci): Drop MSRV:1 patch field (rust-lang/cargo#13442)
- fix(add): Remove inconsistent period (rust-lang/cargo#13446)
- fix(add): Ensure users know a feature is being created (rust-lang/cargo#13434)
- Update tests for changes in latest nightly (rust-lang/cargo#13444)
- docs: Minor clarification of build script metadata. (rust-lang/cargo#13436)
- Fix old_cargos tests (rust-lang/cargo#13435)
- Fix confusing error messages for sparse index replaced source (rust-lang/cargo#13433)
- Enable edition migration for 2024 (rust-lang/cargo#13429)
@rustbot rustbot added this to the 1.78.0 milestone Feb 18, 2024
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Feb 18, 2024
Update cargo

12 commits in fc1d58fd0531a57a6b942a14cdcdbcb82ece16f3..7b7af3077bff8d60b7f124189bc9de227d3063a9
2024-02-09 15:54:29 +0000 to 2024-02-17 14:13:00 +0000
- Remove unnecessary `use` statement in metabuild (rust-lang/cargo#13455)
- chore: Update snapbox (rust-lang/cargo#13441)
- chore(deps): update openssl to 3.2.1 again (rust-lang/cargo#13449)
- fix(test): Suggest `--` for libtest arguments (rust-lang/cargo#13448)
- chore(ci): Drop MSRV:1 patch field (rust-lang/cargo#13442)
- fix(add): Remove inconsistent period (rust-lang/cargo#13446)
- fix(add): Ensure users know a feature is being created (rust-lang/cargo#13434)
- Update tests for changes in latest nightly (rust-lang/cargo#13444)
- docs: Minor clarification of build script metadata. (rust-lang/cargo#13436)
- Fix old_cargos tests (rust-lang/cargo#13435)
- Fix confusing error messages for sparse index replaced source (rust-lang/cargo#13433)
- Enable edition migration for 2024 (rust-lang/cargo#13429)
ehuss pushed a commit to ehuss/cargo that referenced this pull request Feb 28, 2024
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

```
bors added a commit that referenced this pull request Feb 29, 2024
[beta-1.77] Backport ignore `cargo::rustc-check-cfg`

This is a beta backport of #13438 (comment) to disable the warning when `cargo::rustc-check-cfg` is 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:
* #13455 — Remove unnecessary use statement in metabuild
@rustbot rustbot modified the milestones: 1.78.0, 1.77.0 Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-build-scripts Area: build.rs scripts 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.

5 participants