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] Define c_char at top-level and remove per-target c_char definitions #4214

Merged
merged 3 commits into from
Dec 23, 2024

Conversation

tgross35
Copy link
Contributor

Backport #4202

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2024

@tgross35: no appropriate reviewer found, use r? to override

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

Some changes occurred in OpenBSD module

cc @semarie

@tgross35 tgross35 enabled auto-merge December 19, 2024 08:28
@taiki-e
Copy link
Member

taiki-e commented Dec 19, 2024

As for 0.2, we also need to remove c_char from src/psp.rs, like https://github.com/rust-lang/libc/pull/4203/files#diff-0abdf4e9d0e64b993ee63247b3ed855cbf4c6e795b7982a371e9576b78f61c50.

@tgross35 tgross35 added this pull request to the merge queue Dec 19, 2024
@tgross35
Copy link
Contributor Author

Thanks, added 50f82ad to address this.

auto-merge was automatically disabled December 19, 2024 09:11

Pull Request is not mergeable

auto-merge was automatically disabled December 19, 2024 09:14

Pull Request is not mergeable

auto-merge was automatically disabled December 19, 2024 09:14

Pull Request is not mergeable

auto-merge was automatically disabled December 19, 2024 09:15

Pull Request is not mergeable

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 19, 2024
@tgross35 tgross35 enabled auto-merge December 22, 2024 04:06
@tgross35
Copy link
Contributor Author

Merge already, or at least notify me when you don't want to...

@tgross35 tgross35 disabled auto-merge December 23, 2024 07:09
@tgross35 tgross35 closed this Dec 23, 2024
@tgross35 tgross35 reopened this Dec 23, 2024
@tgross35 tgross35 enabled auto-merge December 23, 2024 07:10
taiki-e and others added 3 commits December 23, 2024 07:03
The exception was added after the PR with 0a02b94 ("Define c_char at
top-level...") was posted. Remove this skip since the same commit makes
it no longer relevant.

(backport <rust-lang#4202>)
(cherry picked from commit 2bb023e)
ef8c0f3 ("Define c_char at top-level...") removes the need for per-OS
definitions of `c_char`. Remove the definition of `c_char` from PEP,
which as not covered in the backport (as this module does not exist on
`main`).

Suggested-by: Taiki Endo <[email protected]>
@tgross35 tgross35 force-pushed the backport-c_char-top-level branch from 50f82ad to 37ac889 Compare December 23, 2024 12:03
@tgross35 tgross35 added this pull request to the merge queue Dec 23, 2024
Merged via the queue into rust-lang:libc-0.2 with commit 30309eb Dec 23, 2024
45 checks passed
@tgross35 tgross35 deleted the backport-c_char-top-level branch December 23, 2024 12:46
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