Respond to sussurrus's comments

Author: asomers

test/sys/test_aio.rs

@@ -243,6 +243,7 @@ extern fn sigfunc(_: c_int) {
 #[test]
 #[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips"), ignore)]
 fn test_write_sigev_signal() {
+    #[allow(unused_variables)]
     let m = ::SIGUSR2_MTX.lock().expect("Mutex got poisoned by another test");
     let sa = SigAction::new(SigHandler::Handler(sigfunc),
                             SA_RESETHAND,
@@ -276,7 +277,6 @@ fn test_write_sigev_signal() {
     let len = f.read_to_end(&mut rbuf).unwrap();
     assert!(len == EXPECT.len());
     assert!(rbuf == EXPECT);
-    drop(m);    // appease the unused_variable checker
 }
 
 // Test lio_listio with LIO_WAIT, so all AIO ops should be complete by the time
@@ -374,6 +374,7 @@ fn test_lio_listio_nowait() {
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
 #[cfg_attr(any(target_arch = "mips", target_env = "musl"), ignore)]
 fn test_lio_listio_signal() {
+    #[allow(unused_variables)]
     let m = ::SIGUSR2_MTX.lock().expect("Mutex got poisoned by another test");
     const INITIAL: &'static [u8] = b"abcdef123456";
     const WBUF: &'static [u8] = b"CDEF";
@@ -420,7 +421,6 @@ fn test_lio_listio_signal() {
     let len = f.read_to_end(&mut rbuf2).unwrap();
     assert!(len == EXPECT.len());
     assert!(rbuf2 == EXPECT);
-    drop(m);    // appease the unused_variable checker
 }
 
 // Try to use lio_listio to read into an immutable buffer.  It should fail

test/sys/test_wait.rs

@@ -17,7 +17,7 @@ fn test_wait_signal() {
       // panic, fork should never fail unless there is a serious problem with the OS
       Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    // appease the unused_variable checker
+    drop(m);    // Appease the unused_variable checker
 }
 
 #[test]
@@ -32,5 +32,5 @@ fn test_wait_exit() {
       // panic, fork should never fail unless there is a serious problem with the OS
       Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    // appease the unused_variable checker
+    drop(m);    // Appease the unused_variable checker
 }

test/test_mq.rs

@@ -16,6 +16,7 @@ use nix::Error::Sys;
 
 #[test]
 fn test_mq_send_and_receive() {
+    #[allow(unused_variables)]
     let m = ::FORK_MTX.lock().expect("Mutex got poisoned by another test");
 
     const MSG_SIZE: c_long =  32;
@@ -54,7 +55,6 @@ fn test_mq_send_and_receive() {
       // panic, fork should never fail unless there is a serious problem with the OS
       Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    //appease the unused_variable checker
 }
 
 

test/test_unistd.rs

@@ -11,14 +11,16 @@ use std::io::Write;
 use std::os::unix::prelude::*;
 use tempfile::tempfile;
 use tempdir::TempDir;
-use libc::{_exit, off_t};
+use libc::off_t;
+use std::process::exit;
 
 #[test]
 fn test_fork_and_waitpid() {
+    #[allow(unused_variables)]
     let m = ::FORK_MTX.lock().expect("Mutex got poisoned by another test");
     let pid = fork();
     match pid {
-        Ok(Child) => { unsafe { _exit(0) }; }
+        Ok(Child) => { exit(0); }
         Ok(Parent { child }) => {
             // assert that child was created and pid > 0
             let child_raw: ::libc::pid_t = child.into();
@@ -39,16 +41,16 @@ fn test_fork_and_waitpid() {
         // panic, fork should never fail unless there is a serious problem with the OS
         Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    // appease the unused_variable checker
 }
 
 #[test]
 fn test_wait() {
-    // grab FORK_MTX so wait doesn't reap a different test's child process
+    // Grab FORK_MTX so wait doesn't reap a different test's child process
+    #[allow(unused_variables)]
     let m = ::FORK_MTX.lock().expect("Mutex got poisoned by another test");
     let pid = fork();
     match pid {
-        Ok(Child) => { unsafe { _exit(0) }; }
+        Ok(Child) => { exit(0); }
         Ok(Parent { child }) => {
             let wait_status = wait();
 
@@ -58,7 +60,6 @@ fn test_wait() {
         // panic, fork should never fail unless there is a serious problem with the OS
         Err(_) => panic!("Error: Fork Failed")
     }
-    drop(m);    // appease the unused_variable checker
 }
 
 #[test]
@@ -104,6 +105,7 @@ macro_rules! execve_test_factory(
     ($test_name:ident, $syscall:ident, $unix_sh:expr, $android_sh:expr) => (
     #[test]
     fn $test_name() {
+        #[allow(unused_variables)]
         let m = ::FORK_MTX.lock().expect("Mutex got poisoned by another test");
         // The `exec`d process will write to `writer`, and we'll read that
         // data from `reader`.
@@ -144,14 +146,14 @@ macro_rules! execve_test_factory(
                 assert!(string.contains("baz=quux"));
             }
         }
-        drop(m);    // appease the unused_variable checker
     }
     )
 );
 
 #[test]
 fn test_fchdir() {
     // fchdir changes the process's cwd
+    #[allow(unused_variables)]
     let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
     let tmpdir = TempDir::new("test_fchdir").unwrap();
     let tmpdir_path = tmpdir.path().canonicalize().unwrap();
@@ -161,12 +163,12 @@ fn test_fchdir() {
     assert_eq!(getcwd().unwrap(), tmpdir_path);
 
     assert!(close(tmpdir_fd).is_ok());
-    drop(m);    // appease the unused_variable checker
 }
 
 #[test]
 fn test_getcwd() {
     // chdir changes the process's cwd
+    #[allow(unused_variables)]
     let m = ::CWD_MTX.lock().expect("Mutex got poisoned by another test");
     let tmp_dir = TempDir::new("test_getcwd").unwrap();
     assert!(chdir(tmp_dir.path()).is_ok());
@@ -184,7 +186,6 @@ fn test_getcwd() {
     }
     assert!(chdir(inner_tmp_dir.as_path()).is_ok());
     assert_eq!(getcwd().unwrap(), inner_tmp_dir.as_path());
-    drop(m);    // appease the unused_variable checker
 }
 
 #[test]