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] Drop the libc_const_extern_fn conditional #4063

Merged
merged 1 commit into from
Nov 17, 2024

Conversation

tgross35
Copy link
Contributor

Additionally deprecate the const-extern-fn feature. This is possible since the MSRV was increased to 1.63.

@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 17, 2024

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

@tgross35 tgross35 force-pushed the remove-cfg-const-extern-fn branch 2 times, most recently from 0c726f6 to fa7e411 Compare November 17, 2024 06:02
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.
@tgross35 tgross35 force-pushed the remove-cfg-const-extern-fn branch from fa7e411 to 674cc1f Compare November 17, 2024 06:05
@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 b194077 Nov 17, 2024
44 checks passed
@tgross35 tgross35 deleted the remove-cfg-const-extern-fn branch November 17, 2024 07:25
@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
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)

With the cherry pick, remove `const-extern-fn` rather than just
deprecating it.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)

With the cherry pick, remove `const-extern-fn` rather than just
deprecating it.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 18, 2024
Additionally deprecate the `const-extern-fn` feature. This is possible
since the MSRV was increased to 1.63.

(apply <rust-lang#4063> to `main`)
(cherry picked from commit 674cc1f)
@SteveLauC
Copy link
Contributor

Hi, Looks like this is not working? See Nix PR nix-rust/nix#2544, we tried using the git version of libc, then found that the CMSG_SPACE is not const with the git version of libc (See the CI errors)

@tgross35
Copy link
Contributor Author

Indeed, that was reported in #4115. Will try to fix it soon (I think I want to just remove the feature and instead use an environment variable to indicate we need ctest hacks)

@SteveLauC
Copy link
Contributor

SteveLauC commented Nov 22, 2024

Could you please cc me when you have this fixed 🫣

Update: Just realized that I can subscribe to #4115 😄

@tgross35 tgross35 added main-applied This PR was merged against libc-0.2 and main has since been updated to include it and removed main-needs-cherry-pick This PR was merged against libc-0.2 but does not yet exist in main. labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
main-applied This PR was merged against libc-0.2 and main has since been updated to include it O-macos O-unix S-waiting-on-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants