summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAmanjeev Sethi <aj@amanjeev.com>2019-02-10 22:44:18 -0500
committerAmanjeev Sethi <aj@amanjeev.com>2019-02-12 15:25:47 -0500
commit1b2fadd21a7f8784624d81094255530bb2cdca23 (patch)
tree36e28968d8d1ceefaf745e3bbb294f3731c4eece /src
parent7ae7a1f9554a06d947da9cb0a496a1e2e264982a (diff)
downloadnix-1b2fadd21a7f8784624d81094255530bb2cdca23.zip
`PollFd` event flags renamed to `PollFlags` from `EventFlags`.
Most of the EventFlags have been renamed already, but Poll was the only one remaining. This commit fixes that. Issue 317 https://github.com/nix-rust/nix/issues/317
Diffstat (limited to 'src')
-rw-r--r--src/poll.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/poll.rs b/src/poll.rs
index eb6b2417..160b5bc6 100644
--- a/src/poll.rs
+++ b/src/poll.rs
@@ -27,19 +27,19 @@ pub struct PollFd {
impl PollFd {
/// Creates a new `PollFd` specifying the events of interest
/// for a given file descriptor.
- pub fn new(fd: RawFd, events: EventFlags) -> PollFd {
+ pub fn new(fd: RawFd, events: PollFlags) -> PollFd {
PollFd {
pollfd: libc::pollfd {
fd: fd,
events: events.bits(),
- revents: EventFlags::empty().bits(),
+ revents: PollFlags::empty().bits(),
},
}
}
/// Returns the events that occured in the last call to `poll` or `ppoll`.
- pub fn revents(&self) -> Option<EventFlags> {
- EventFlags::from_bits(self.pollfd.revents)
+ pub fn revents(&self) -> Option<PollFlags> {
+ PollFlags::from_bits(self.pollfd.revents)
}
}
@@ -48,11 +48,11 @@ impl fmt::Debug for PollFd {
let pfd = self.pollfd;
let mut ds = f.debug_struct("PollFd");
ds.field("fd", &pfd.fd);
- match EventFlags::from_bits(pfd.events) {
+ match PollFlags::from_bits(pfd.events) {
None => ds.field("events", &pfd.events),
Some(ef) => ds.field("events", &ef),
};
- match EventFlags::from_bits(pfd.revents) {
+ match PollFlags::from_bits(pfd.revents) {
None => ds.field("revents", &pfd.revents),
Some(ef) => ds.field("revents", &ef),
};
@@ -62,7 +62,7 @@ impl fmt::Debug for PollFd {
libc_bitflags! {
/// These flags define the different events that can be monitored by `poll` and `ppoll`
- pub struct EventFlags: libc::c_short {
+ pub struct PollFlags: libc::c_short {
/// There is data to read.
POLLIN;
/// There is some exceptional condition on the file descriptor.