Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nix-rust/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ed91f2f5030eee4a831501e69f21e4e2dea546e4
Choose a base ref
..
head repository: nix-rust/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e19ffab8b1615f6cc617f0972317e0131ec8d62d
Choose a head ref
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/poll.rs
10 changes: 5 additions & 5 deletions src/poll.rs
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ use {Errno, Result};
/// This is a wrapper around `libc::pollfd`.
///
/// It's meant to be used as an argument to the [`poll`](fn.poll.html) and
/// [`ppoll`](fn.ppoll.html) functions to specify the events of interes
/// [`ppoll`](fn.ppoll.html) functions to specify the events of interest
/// for a specific file descriptor.
///
/// After a call to `poll` or `ppoll`, the events that occured can be
@@ -22,7 +22,7 @@ pub struct PollFd {
}

impl PollFd {
/// Creates a new `PollFd` specifying the events of interested
/// Creates a new `PollFd` specifying the events of interest
/// for a given file descriptor.
pub fn new(fd: RawFd, events: EventFlags) -> PollFd {
PollFd {
@@ -93,8 +93,8 @@ libc_bitflags! {
/// `poll` waits for one of a set of file descriptors to become ready to perform I/O.
/// ([`poll(2)`](http://man7.org/linux/man-pages/man2/poll.2.html))
///
/// `fds` is a slice containing all [`PollFd`](struct.PollFd.html) to poll.
/// The function will return as soon as one event registered in one of the `PollFd` occurs.
/// `fds` contains all [`PollFd`](struct.PollFd.html) to poll.
/// The function will return as soon as any event occur for any of these `PollFd`s.
///
/// The `timeout` argument specifies the number of milliseconds that `poll()`
/// should block waiting for a file descriptor to become ready. The call
@@ -124,7 +124,7 @@ pub fn poll(fds: &mut [PollFd], timeout: libc::c_int) -> Result<libc::c_int> {
/// descriptor becomes ready or until a signal is caught.
/// ([`poll(2)`](http://man7.org/linux/man-pages/man2/poll.2.html))
///
/// `ppoll` behaves like `poll`, but let you precise what signals may interrupt it
/// `ppoll` behaves like `poll`, but let you specify what signals may interrupt it
/// with the `sigmask` argument.
///
#[cfg(any(target_os = "android", target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))]