Skip to content

Commit

Permalink
Auto merge of #401 - fiveop:fix_warnings, r=posborne
Browse files Browse the repository at this point in the history
Get rid of a few warnings during compilation of tests
  • Loading branch information
homu committed Aug 16, 2016
2 parents 5f963ad + 51be2c9 commit 6ffe71e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions test/test_mount.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mod test_mount {
use std::os::unix::fs::PermissionsExt;
use std::process::{self, Command};

use libc::{self, EACCES, EROFS};
use libc::{EACCES, EROFS};

use nix::mount::{mount, umount, MsFlags, MS_BIND, MS_RDONLY, MS_NOEXEC};
use nix::sched::{unshare, CLONE_NEWNS, CLONE_NEWUSER};
Expand Down Expand Up @@ -179,8 +179,8 @@ exit 23";
let mut handle = stderr.lock();
writeln!(handle,
"unshare failed: {}. Are unprivileged user namespaces available?",
e);
writeln!(handle, "mount is not being tested");
e).unwrap();
writeln!(handle, "mount is not being tested").unwrap();
// Exit with success because not all systems support unprivileged user namespaces, and
// that's not what we're testing for.
process::exit(0);
Expand Down
3 changes: 2 additions & 1 deletion test/test_signalfd.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
extern crate nix;

#[cfg(feature = "signalfd")]

use nix::sys::signalfd::SignalFd;
#[cfg(feature = "signalfd")]
use nix::sys::signal;
#[cfg(feature = "signalfd")]
use nix::unistd;

#[cfg(feature = "signalfd")]
Expand Down

0 comments on commit 6ffe71e

Please sign in to comment.