Skip to content

Rename EventFlag to EvFlag and FilterFlag to NoteFlag #1135

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

Closed
wants to merge 1 commit into from
Closed

Rename EventFlag to EvFlag and FilterFlag to NoteFlag #1135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/sys/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ pub type type_of_event_flag = u16;
#[cfg(any(target_os = "netbsd"))]
pub type type_of_event_flag = u32;
libc_bitflags!{
pub struct EventFlag: type_of_event_flag {
pub struct EvFlag: type_of_event_flag {
EV_ADD;
EV_CLEAR;
EV_DELETE;
Expand Down Expand Up @@ -123,7 +123,7 @@ libc_bitflags!{
}

libc_bitflags!(
pub struct FilterFlag: u32 {
pub struct NoteFlag: u32 {
#[cfg(any(target_os = "macos", target_os = "ios"))]
NOTE_ABSOLUTE;
NOTE_ATTRIB;
Expand Down Expand Up @@ -231,8 +231,8 @@ unsafe impl Send for KEvent {
}

impl KEvent {
pub fn new(ident: uintptr_t, filter: EventFilter, flags: EventFlag,
fflags:FilterFlag, data: intptr_t, udata: intptr_t) -> KEvent {
pub fn new(ident: uintptr_t, filter: EventFilter, flags: EvFlag,
fflags:NoteFlag, data: intptr_t, udata: intptr_t) -> KEvent {
KEvent { kevent: libc::kevent {
ident,
filter: filter as type_of_event_filter,
Expand All @@ -251,12 +251,12 @@ impl KEvent {
unsafe { mem::transmute(self.kevent.filter as type_of_event_filter) }
}

pub fn flags(&self) -> EventFlag {
EventFlag::from_bits(self.kevent.flags).unwrap()
pub fn flags(&self) -> EvFlag {
EvFlag::from_bits(self.kevent.flags).unwrap()
}

pub fn fflags(&self) -> FilterFlag {
FilterFlag::from_bits(self.kevent.fflags).unwrap()
pub fn fflags(&self) -> NoteFlag {
NoteFlag::from_bits(self.kevent.fflags).unwrap()
}

pub fn data(&self) -> intptr_t {
Expand Down Expand Up @@ -313,8 +313,8 @@ pub fn kevent_ts(kq: RawFd,
pub fn ev_set(ev: &mut KEvent,
ident: usize,
filter: EventFilter,
flags: EventFlag,
fflags: FilterFlag,
flags: EvFlag,
fflags: NoteFlag,
udata: intptr_t) {

ev.kevent.ident = ident as uintptr_t;
Expand All @@ -331,8 +331,8 @@ fn test_struct_kevent() {

let actual = KEvent::new(0xdead_beef,
EventFilter::EVFILT_READ,
EventFlag::EV_ONESHOT | EventFlag::EV_ADD,
FilterFlag::NOTE_CHILD | FilterFlag::NOTE_EXIT,
EvFlag::EV_ONESHOT | EvFlag::EV_ADD,
NoteFlag::NOTE_CHILD | NoteFlag::NOTE_EXIT,
0x1337,
udata);
assert_eq!(0xdead_beef, actual.ident());
Expand Down