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

[main] Drop the libc_const_extern_fn conditional #4105

Merged
merged 1 commit into from
Nov 18, 2024

Conversation

tgross35
Copy link
Contributor

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

(apply #4063 to main)
(cherry picked from commit 674cc1f)

@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 force-pushed the remove-cfg-const-extern-fn-main branch 3 times, most recently from 015a53e to 7cd141a Compare November 18, 2024 19:07
@tgross35 tgross35 enabled auto-merge November 18, 2024 19:08
@tgross35 tgross35 force-pushed the remove-cfg-const-extern-fn-main branch 2 times, most recently from 9e7c600 to b1de7a2 Compare November 18, 2024 19:09
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 tgross35 force-pushed the remove-cfg-const-extern-fn-main branch from b1de7a2 to fa554bc Compare November 18, 2024 19:35
@tgross35 tgross35 added this pull request to the merge queue Nov 18, 2024
Merged via the queue into rust-lang:main with commit 22d4318 Nov 18, 2024
44 checks passed
@tgross35 tgross35 deleted the remove-cfg-const-extern-fn-main branch November 18, 2024 20:49
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 26, 2024
In [1] this conditional was dropped in favor of a Cargo feature, which
was turned on by default in [2].

Fixes: rust-lang#4149

[1]: rust-lang#4105
[2]: rust-lang#4134
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 26, 2024
In [1] this conditional was dropped in favor of a Cargo feature, which
was turned on by default in [2].

Fixes: rust-lang#4149

[1]: rust-lang#4105
[2]: rust-lang#4134
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 26, 2024
In [1] this conditional was dropped in favor of a Cargo feature, which
was turned on by default in [2]. However, this did not help the case
where `--no-default-features` is passed.

Unfortunately we still can't drop this config entirely since `ctest`
cannot parse the syntax, so change back to useing a `cfg` to control
constness rather than a Cargo feature.

Fixes: rust-lang#4149

[1]: rust-lang#4105
[2]: rust-lang#4134
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 26, 2024
In [1] this conditional was dropped in favor of a Cargo feature, which
was turned on by default in [2]. However, this did not help the case
where `--no-default-features` is passed.

Unfortunately we still can't drop this config entirely since `ctest`
cannot parse the syntax, so change back to useing a `cfg` to control
constness rather than a Cargo feature.

Additionally, remove a portion of the macro's comment that is no longer
relevant.

Fixes: rust-lang#4149

[1]: rust-lang#4105
[2]: rust-lang#4134
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 26, 2024
In [1] this conditional was dropped in favor of a Cargo feature, which
was turned on by default in [2]. However, this did not help the case
where `--no-default-features` is passed.

Unfortunately we still can't drop this config entirely since `ctest`
cannot parse the syntax, so change back to useing a `cfg` to control
constness rather than a Cargo feature.

Additionally, remove a portion of the macro's comment that is no longer
relevant.

Fixes: rust-lang#4149

[1]: rust-lang#4105
[2]: rust-lang#4134

(backport <rust-lang#4151>)
(cherry picked from commit e18ee8c)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 26, 2024
In [1] this conditional was dropped in favor of a Cargo feature, which
was turned on by default in [2]. However, this did not help the case
where `--no-default-features` is passed.

Unfortunately we still can't drop this config entirely since `ctest`
cannot parse the syntax, so change back to useing a `cfg` to control
constness rather than a Cargo feature.

Additionally, remove a portion of the macro's comment that is no longer
relevant.

Fixes: rust-lang#4149

[1]: rust-lang#4105
[2]: rust-lang#4134

(backport <rust-lang#4151>)
(cherry picked from commit e18ee8c)
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.

3 participants