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.

Sign up for GitHub

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

Jump to bottom

Define c_char at top-level and remove per-target c_char definitions #4202

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Define c_char at top-level and remove per-target c_char definitions #4202

merged 2 commits into from
Dec 19, 2024

Conversation

taiki-e
Copy link
Member

@taiki-e taiki-e commented Dec 17, 2024 •
edited
Loading

Description

Replaces #4201

This is the approach I said I think is ideal in #4199 (comment).

It does not have the CI problem #4201 has.

Sources

Checklist

  • Relevant tests in libc-test/semver have been updated
  • No placeholder or unstable values like *LAST or *MAX are
    included (see #3131)
  • Tested locally (cd libc-test && cargo test --target mytarget);
    especially relevant for platforms that may not be checked in CI

@rustbot
Copy link
Collaborator

rustbot commented Dec 17, 2024

r? @tgross35

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

This was referenced Dec 17, 2024
Closed
Closed
@taiki-e
Copy link
Member Author

taiki-e commented Dec 17, 2024

I was concerned about whether this was backport friendly or not, but it turns out that it is not really a problem: #4203

@taiki-e taiki-e mentioned this pull request Dec 17, 2024
Merged
3 tasks
@bors
Copy link
Contributor

bors commented Dec 17, 2024

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

@rustbot
Copy link
Collaborator

rustbot commented Dec 18, 2024

Some changes occurred in OpenBSD module

cc @semarie

@rustbot
Copy link
Collaborator

rustbot commented Dec 18, 2024

Some changes occurred in solarish module

cc @jclulow, @pfmooney

taiki-e added a commit to taiki-e/libc that referenced this pull request Dec 18, 2024
@taiki-e
Define c_char at top-level and remove per-target c_char definitions
7edd412 
(backport <rust-lang#4202>)
(cherry picked from commit 8ab8323)
@taiki-e taiki-e mentioned this pull request Dec 18, 2024
Closed
taiki-e and others added 2 commits December 19, 2024 08:20
@taiki-e @tgross35
Define c_char at top-level and remove per-target c_char definitions
0a02b94
@tgross35
Remove the c_char_def workaround for OpenBSD
2bb023e 
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.
tgross35
tgross35 approved these changes Dec 19, 2024
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I double checked everything here, looks like there are no further discrepancies. Pushed a commit that removes the last remaining c_char_def skip, which was added in #4210.

Thanks for the cleanup!

@tgross35 tgross35 enabled auto-merge December 19, 2024 08:25
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Dec 19, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Dec 19, 2024
@taiki-e @tgross35
Define c_char at top-level and remove per-target c_char definitions
ef8c0f3 
(backport <rust-lang#4202>)
(cherry picked from commit 0a02b94)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Dec 19, 2024
@tgross35
Remove the c_char_def workaround for OpenBSD
7ab55a3 
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)
@tgross35 tgross35 mentioned this pull request Dec 19, 2024
Merged
@tgross35 tgross35 added this pull request to the merge queue Dec 19, 2024
Merged via the queue into rust-lang:main with commit 1867bf3 Dec 19, 2024
45 checks passed
@bors bors mentioned this pull request Dec 19, 2024
Draft
2 tasks
@taiki-e taiki-e deleted the c-char3 branch December 19, 2024 11:17
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Dec 23, 2024
@taiki-e @tgross35
Define c_char at top-level and remove per-target c_char definitions
8448147 
(backport <rust-lang#4202>)
(cherry picked from commit 0a02b94)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Dec 23, 2024
@tgross35
Remove the c_char_def workaround for OpenBSD
315dd4c 
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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgross35 tgross35 tgross35 approved these changes

Assignees

@tgross35 tgross35

Labels
O-android O-arm O-dragonfly O-gnu O-linux O-macos O-mips O-musl O-newlib O-redox O-riscv O-solarish O-sparc O-unix O-wasi O-windows O-x86 S-waiting-on-review stable-nominated This PR should be considered for cherry-pick to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@taiki-e @rustbot @bors @tgross35