Skip to content

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Aug 5, 2024

What does this PR try to resolve?

In #14153 we allowed the to be merged rust-lang/rust#126158 lint. Since then an FCP was conducted and the lint was renamed to explicit_builtin_cfgs_in_flags. This PR renames the lint in the same test so that rust-lang/rust#126158 can be merged.

Additional information

rust-lang/rust#126158 (comment) shows the failing test.

@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 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.

Thanks!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 6, 2024

📌 Commit e03f2db 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 Aug 6, 2024
@bors
Copy link
Contributor

bors commented Aug 6, 2024

⌛ Testing commit e03f2db with merge 403bc5b...

@bors
Copy link
Contributor

bors commented Aug 6, 2024

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

@bors bors merged commit 403bc5b into rust-lang:master Aug 6, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
Update cargo

3 commits in fa646583675d7c140482bd906145c71b7fb4fc2b..94977cb1fab003d45eb5bb108cb5e2fa0149672a
2024-08-02 16:08:06 +0000 to 2024-08-06 21:42:10 +0000
- Don't specify the depedency name in the `cargo add` inferred name test (rust-lang/cargo#14357)
- Fix renamed disallowed cfg lint name (rust-lang/cargo#14352)
- fix(build-std): remove hack on creating virtual std workspace (rust-lang/cargo#14358)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Aug 7, 2024
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Aug 12, 2024
Update cargo

3 commits in fa646583675d7c140482bd906145c71b7fb4fc2b..94977cb1fab003d45eb5bb108cb5e2fa0149672a
2024-08-02 16:08:06 +0000 to 2024-08-06 21:42:10 +0000
- Don't specify the depedency name in the `cargo add` inferred name test (rust-lang/cargo#14357)
- Fix renamed disallowed cfg lint name (rust-lang/cargo#14352)
- fix(build-std): remove hack on creating virtual std workspace (rust-lang/cargo#14358)

r? ghost
bors added a commit that referenced this pull request Aug 14, 2024
[beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024"

Beta backports

* #14295

In order to make CI pass, the following PRs are also cherry-picked:

* #14352
* Ignore `build_std::{cross_custom,custom_test_framework,remap_path_scope}` tests (see also #14368)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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