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

Implement AsRawFd for PollFd #1516

Merged
merged 1 commit into from
Sep 8, 2021
Merged

Implement AsRawFd for PollFd #1516

merged 1 commit into from
Sep 8, 2021

Conversation

cemeyer
Copy link
Contributor

@cemeyer cemeyer commented Sep 7, 2021

Implement the trait on PollFd, providing an as_raw_fd() accessor to
get the RawFd associated with the PollFd.

Subsumes #1147, #1286. Closes #1146.

Test: cargo test --test test test_pollfd_fd

Implement the trait on PollFd, providing an `as_raw_fd()` accessor to
get the RawFd associated with the PollFd.

Subsumes nix-rust#1147, nix-rust#1286.  Closes nix-rust#1146.

Test: `cargo test --test test test_pollfd_fd`
@cemeyer
Copy link
Contributor Author

cemeyer commented Sep 7, 2021

Will have a CHANGELOG.md conflict with #1515, which is one of the annoying aspects of maintaining a Changelog file in-repo.

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.

Yes, CHANGELOG conflicts are common and annoying. The saltstack project does something cool, which is to create a separate file for the changelog entry of every PR. Then when they make a release they run a script to merge those changelog entries into the main CHANGELOG. I think something like that would work well for Nix.

bors r+

@bors bors bot merged commit 53fea96 into nix-rust:master Sep 8, 2021
@cemeyer
Copy link
Contributor Author

cemeyer commented Sep 8, 2021

Another changelog idea I've seen is formatting commits such that a tool can construct the document from them. E.g., https://www.conventionalcommits.org/en/v1.0.0/ .

@asomers
Copy link
Member

asomers commented Sep 8, 2021

I've seen that one. But I don't think it would work. Enforcing consistent commit message is harder than enforcing consistent changelog entries, especially on a project with so many different contributors.

@cemeyer
Copy link
Contributor Author

cemeyer commented Sep 8, 2021

I think it should be enforceable via bors / pre-commit CI check, but I haven't investigated very hard.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expose RawFd in impl PollFd
2 participants