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] Require rust >= 1.37 and drop libc_underscore_const_names conditional #4064

Merged

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 16, 2024

Cherry picked from #2845

@rustbot
Copy link
Collaborator

rustbot commented Nov 16, 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

@bors
Copy link
Contributor

bors commented Nov 16, 2024

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

@tgross35 tgross35 force-pushed the remove-cfg-underscore-const-names branch 6 times, most recently from 19751e6 to 9ecc234 Compare November 17, 2024 05:56
[ disable static assert that ctest can't handle - Trevor ]
@tgross35 tgross35 force-pushed the remove-cfg-underscore-const-names branch from 9ecc234 to f0febd5 Compare November 17, 2024 05:56
@tgross35 tgross35 enabled auto-merge November 17, 2024 05:57
@tgross35 tgross35 added this pull request to the merge queue Nov 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 17, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 17, 2024
Merged via the queue into rust-lang:libc-0.2 with commit 7c64d5d Nov 17, 2024
44 checks passed
@tgross35 tgross35 deleted the remove-cfg-underscore-const-names branch November 17, 2024 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants