Merge #953

953: Eliminate compiler warnings, especially on non-Linux platforms r=asomers a=asomers Co-authored-by: Alan Somers <asomers@gmail.com>
nix-rust · Oct 15, 2018 · 5e077cc · 5e077cc
2 parents 175be51 + 682bd37
commit 5e077cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/test/sys/test_ptrace.rs b/test/sys/test_ptrace.rs
@@ -3,6 +3,7 @@ use nix::errno::Errno;
 use nix::unistd::getpid;
 use nix::sys::ptrace::{self, Options};
 
+#[cfg(any(target_os = "android", target_os = "linux"))]
 use std::mem;
 
 #[test]

diff --git a/test/test_mount.rs b/test/test_mount.rs
@@ -206,6 +206,7 @@ exit 23";
 // Test runner
 
 /// Mimic normal test output (hackishly).
+#[cfg(target_os = "linux")]
 macro_rules! run_tests {
     ( $($test_fn:ident),* ) => {{
         println!();

diff --git a/test/test_stat.rs b/test/test_stat.rs
@@ -174,7 +174,7 @@ fn test_utimes() {
     let fullpath = tempdir.path().join("file");
     drop(File::create(&fullpath).unwrap());
 
-    utimes(&fullpath, &TimeVal::seconds(9990), &TimeVal::seconds(5550));
+    utimes(&fullpath, &TimeVal::seconds(9990), &TimeVal::seconds(5550)).unwrap();
     assert_times_eq(9990, 5550, &fs::metadata(&fullpath).unwrap());
 }