diff --git a/CHANGELOG.md b/CHANGELOG.md index b8ae74ca31..c87b045eac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed - The minimum supported version of rustc is now 1.7.0. ([#444](https://github.com/nix-rust/nix/pull/444)) +- Implement `Send` for `KEvent` + ([#442](https://github.com/nix-rust/nix/pull/442)) - Changed `KEvent` to an opaque structure that may only be modified by its constructor and the `ev_set` method. ([#415](https://github.com/nix-rust/nix/pull/415)) diff --git a/src/sys/event.rs b/src/sys/event.rs index d44963db03..68528c9ecc 100644 --- a/src/sys/event.rs +++ b/src/sys/event.rs @@ -191,6 +191,13 @@ pub fn kqueue() -> Result { Errno::result(res) } + +// KEvent can't derive Send because on some operating systems, udata is defined +// as a void*. However, KEvent's public API always treats udata as a uintptr_t, +// which is safe to Send. +unsafe impl Send for KEvent { +} + impl KEvent { pub fn new(ident: uintptr_t, filter: EventFilter, flags: EventFlag, fflags:FilterFlag, data: intptr_t, udata: uintptr_t) -> KEvent {