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

[0.2] Remove the long_array conditional #4096

Merged
merged 1 commit into from
Nov 18, 2024

Conversation

tgross35
Copy link
Contributor

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Nov 18, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
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

@tgross35 tgross35 enabled auto-merge November 18, 2024 12:37
@tgross35 tgross35 force-pushed the remove-cfg-long-array branch from a324fe1 to bdaa6cd Compare November 18, 2024 12:39
@tgross35 tgross35 added this pull request to the merge queue Nov 18, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 18, 2024
@bors
Copy link
Contributor

bors commented Nov 18, 2024

☔ The latest upstream changes (presumably #4093) made this pull request unmergeable. Please resolve the merge conflicts.

@tgross35 tgross35 force-pushed the remove-cfg-long-array branch from bdaa6cd to 756a285 Compare November 18, 2024 13:28
@tgross35 tgross35 enabled auto-merge November 18, 2024 13:28
@tgross35 tgross35 changed the title Remove the long_array conditional [0.2] Remove the long_array conditional Nov 18, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 18, 2024
Merged via the queue into rust-lang:libc-0.2 with commit ab722fb Nov 18, 2024
44 checks passed
@tgross35 tgross35 deleted the remove-cfg-long-array branch November 18, 2024 18:45
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
(apply <rust-lang#4096> to `main`)
(cherry picked from commit 756a285)
@tgross35 tgross35 added the main-needs-cherry-pick This PR was merged against libc-0.2 but does not yet exist in main. label Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
main-needs-cherry-pick This PR was merged against libc-0.2 but does not yet exist in main. O-macos O-unix S-waiting-on-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants