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

Unify the ioctl declarations on linux #3722

Merged
merged 1 commit into from
Aug 15, 2024

Conversation

espindola
Copy link
Contributor

@espindola espindola commented May 25, 2024

I originally wanted to have all versions take a c_uint, since that is what the kernel expects on the other side. I then found that the test infrastructure, quite reasonably, enforces that the symbol matches what the C library provides.

So this PR is now just a small cleanup that uses the existing Ioctl type to reduce duplication.

@rustbot
Copy link
Collaborator

rustbot commented May 25, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@espindola espindola force-pushed the unsigned-ioctl-request branch 2 times, most recently from 106748e to 9b4aea4 Compare May 25, 2024 20:35
@bors
Copy link
Contributor

bors commented Aug 14, 2024

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

This uses the existing Ioctl type to reduce the duplication.
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.

This is a nice cleanup, thanks. Could you double check that the tests in libc-test/semver are up to date?

@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Aug 15, 2024
@espindola
Copy link
Contributor Author

This is a nice cleanup, thanks. Could you double check that the tests in libc-test/semver are up to date?

I can't run the tests, since ctest2 complains that

  unknown os/family: x86_64-alpine-linux-musl
``

But they passed on CI and I didn't change what gets exported.

@espindola
Copy link
Contributor Author

But they passed on CI and I didn't change what gets exported.

In fact, ioctl is listed in unix.txt, so it is already expected everywhere.

@tgross35
Copy link
Contributor

Thanks for confirming!

@tgross35 tgross35 added this pull request to the merge queue Aug 15, 2024
Merged via the queue into rust-lang:main with commit d302ca5 Aug 15, 2024
39 checks passed
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 29, 2024
This uses the existing Ioctl type to reduce the duplication.

(backport <rust-lang#3722>)
(cherry picked from commit 01a3617)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Aug 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants