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

Epoll timeout #2202

Merged
merged 1 commit into from
Nov 25, 2023
Merged

Epoll timeout #2202

merged 1 commit into from
Nov 25, 2023

Conversation

JonathanWoollett-Light
Copy link
Contributor

What does this PR do

Makes the PollTimeout from #1876 generic so it can be used by Epoll.

Checklist:

  • I have read CONTRIBUTING.md
  • I have written necessary tests and rustdoc comments
  • A change log has been added if this PR modifies nix's API

@JonathanWoollett-Light
Copy link
Contributor Author

Blocked on #1876

@asomers
Copy link
Member

asomers commented Nov 23, 2023

Can you please rebase to resolve the conflict?

@JonathanWoollett-Light
Copy link
Contributor Author

Can you please rebase to resolve the conflict?

Rebased.

asomers
asomers requested changes Nov 23, 2023
View reviewed changes
src/lib.rs Outdated Show resolved Hide resolved
@JonathanWoollett-Light JonathanWoollett-Light force-pushed the epoll-timeout branch 4 times, most recently from b79c2b8 to 3df6d9d Compare November 24, 2023 15:15
asomers
asomers requested changes Nov 24, 2023
View reviewed changes
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

Looks good. Could you please add a CHANGELOG?

@JonathanWoollett-Light
Copy link
Contributor Author

JonathanWoollett-Light commented Nov 24, 2023 •
edited
Loading

Looks good. Could you please add a CHANGELOG?

Added.

@SteveLauC SteveLauC added this pull request to the merge queue Nov 25, 2023
Merged via the queue into nix-rust:master with commit 28e2a5e Nov 25, 2023
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SteveLauC SteveLauC SteveLauC left review comments

@asomers asomers asomers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JonathanWoollett-Light @asomers @SteveLauC