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

Move Linux's POLLRDHUP into linux_like and fix its type. #2483

Merged
merged 1 commit into from Oct 30, 2021

Conversation

sunfishcode
Copy link
Member

This was originally posted as #2390, but since it was a breaking change,
that PR instead just added deprecated warnings. There haven't been any
concerns for a while, so this is now a PR to do the change actually, per
the breaking-change-policy.

This fixes two errors in #2247.

  • It moves the definitions of POLLRDHUP out of linux_like/linux
    and into linux_like, so that they're available on Android as well.

  • It changes the type from c_int to c_short to match the other
    POLL* flags.

This was originally posted as rust-lang#2390, but since it was a breaking change,
that PR instead just added `deprecated` warnings. There haven't been any
concerns for a while, so this is now a PR to do the change actually, per
the [breaking-change-policy].

This fixes two errors in rust-lang#2247.

 - It moves the definitions of `POLLRDHUP` out of `linux_like/linux`
   and into `linux_like`, so that they're available on Android as well.

 - It changes the type from `c_int` to `c_short` to match the other
   `POLL*` flags.

[breaking-change-policy]: https://github.com/rust-lang/libc/blob/master/CONTRIBUTING.md#breaking-change-policy
@rust-highfive
Copy link

r? @JohnTitor

(rust-highfive has picked a reviewer for you, use r? to override)

Copy link
Member

@JohnTitor JohnTitor 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 the first time to do an actual change since we have that policy. Let's see if the period (1-2 months, i.e. 3 releases) is enough.

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 30, 2021

📌 Commit 1f657fc has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Oct 30, 2021

⌛ Testing commit 1f657fc with merge abbfad2...

@bors
Copy link
Contributor

bors commented Oct 30, 2021

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing abbfad2 to master...

@bors bors merged commit abbfad2 into rust-lang:master Oct 30, 2021
@sunfishcode sunfishcode deleted the sunfishcode/linux-pollrdhup branch December 2, 2021 16:00
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.

None yet

4 participants