Merge #1778

1778: fix clippy assertions_on_result_states r=rtzoeller a=pacak

https://rust-lang.github.io/rust-clippy/master/index.html#assertions_on_result_states


Fixes broken CI for #1744

Co-authored-by: Michael Baikov <manpacket@gmail.com>

Author: bors[bot]

src/sys/signal.rs

@@ -1189,7 +1189,7 @@ mod tests {
             let mut test_mask = prev_mask;
             test_mask.add(SIGUSR1);
 
-            assert!(test_mask.thread_set_mask().is_ok());
+            test_mask.thread_set_mask().expect("assertion failed");
             let new_mask =
                 SigSet::thread_get_mask().expect("Failed to get new mask!");
 
@@ -1211,7 +1211,7 @@ mod tests {
             let mut mask = SigSet::empty();
             mask.add(SIGUSR1);
 
-            assert!(mask.thread_block().is_ok());
+            mask.thread_block().expect("assertion failed");
 
             assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
         })
@@ -1226,7 +1226,7 @@ mod tests {
             let mut mask = SigSet::empty();
             mask.add(SIGUSR1);
 
-            assert!(mask.thread_unblock().is_ok());
+            mask.thread_unblock().expect("assertion failed");
 
             assert!(!SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
         })

src/sys/signalfd.rs

@@ -148,14 +148,17 @@ mod tests {
     fn create_signalfd() {
         let mask = SigSet::empty();
         let fd = SignalFd::new(&mask);
-        assert!(fd.is_ok());
+        fd.expect("assert failed");
     }
 
     #[test]
     fn create_signalfd_with_opts() {
         let mask = SigSet::empty();
-        let fd = SignalFd::with_flags(&mask, SfdFlags::SFD_CLOEXEC | SfdFlags::SFD_NONBLOCK);
-        assert!(fd.is_ok());
+        let fd = SignalFd::with_flags(
+            &mask,
+            SfdFlags::SFD_CLOEXEC | SfdFlags::SFD_NONBLOCK,
+        );
+        fd.expect("assert failed");
     }
 
     #[test]

src/sys/termios.rs

@@ -1107,8 +1107,8 @@ mod test {
     fn try_from() {
         assert_eq!(Ok(BaudRate::B0), BaudRate::try_from(libc::B0));
         #[cfg(not(target_os = "haiku"))]
-        assert!(BaudRate::try_from(999999999).is_err());
+        BaudRate::try_from(999999999).expect_err("assertion failed");
         #[cfg(target_os = "haiku")]
-        assert!(BaudRate::try_from(99).is_err());
+        BaudRate::try_from(99).expect_err("assertion failed");
     }
 }

test/sys/test_aio.rs

@@ -85,7 +85,7 @@ mod aio_fsync {
             SigevNotify::SigevNone,
         ));
         let err = aiof.as_mut().submit();
-        assert!(err.is_err());
+        err.expect_err("assertion failed");
     }
 
     #[test]
@@ -102,7 +102,7 @@ mod aio_fsync {
             SigevNotify::SigevNone,
         ));
         let err = aiof.as_mut().submit();
-        assert!(err.is_ok());
+        err.expect("assert failed");
         poll_aio!(&mut aiof).unwrap();
         aiof.as_mut().aio_return().unwrap();
     }
@@ -149,7 +149,7 @@ mod aio_read {
         aior.as_mut().submit().unwrap();
 
         let cancelstat = aior.as_mut().cancel();
-        assert!(cancelstat.is_ok());
+        cancelstat.expect("assert failed");
 
         // Wait for aiow to complete, but don't care whether it succeeded
         let _ = poll_aio!(&mut aior);
@@ -174,7 +174,7 @@ mod aio_read {
             0, //priority
             SigevNotify::SigevNone,
         ));
-        assert!(aior.as_mut().submit().is_err());
+        aior.as_mut().submit().expect_err("assertion failed");
     }
 
     // Test a simple aio operation with no completion notification.  We must
@@ -342,7 +342,7 @@ mod aio_write {
         assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS));
 
         let cancelstat = aiow.as_mut().cancel();
-        assert!(cancelstat.is_ok());
+        cancelstat.expect("assert failed");
 
         // Wait for aiow to complete, but don't care whether it succeeded
         let _ = poll_aio!(&mut aiow);
@@ -426,7 +426,7 @@ mod aio_write {
             0, //priority
             SigevNotify::SigevNone,
         ));
-        assert!(aiow.as_mut().submit().is_err());
+        aiow.as_mut().submit().expect_err("assertion failed");
         // Dropping the AioWrite at this point should not panic
     }
 }
@@ -565,7 +565,7 @@ fn test_aio_cancel_all() {
     assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS));
 
     let cancelstat = aio_cancel_all(f.as_raw_fd());
-    assert!(cancelstat.is_ok());
+    cancelstat.expect("assert failed");
 
     // Wait for aiocb to complete, but don't care whether it succeeded
     let _ = poll_aio!(&mut aiocb);

test/sys/test_epoll.rs

@@ -6,11 +6,11 @@ use nix::sys::epoll::{EpollCreateFlags, EpollEvent, EpollFlags, EpollOp};
 pub fn test_epoll_errno() {
     let efd = epoll_create1(EpollCreateFlags::empty()).unwrap();
     let result = epoll_ctl(efd, EpollOp::EpollCtlDel, 1, None);
-    assert!(result.is_err());
+    result.expect_err("assertion failed");
     assert_eq!(result.unwrap_err(), Errno::ENOENT);
 
     let result = epoll_ctl(efd, EpollOp::EpollCtlAdd, 1, None);
-    assert!(result.is_err());
+    result.expect_err("assertion failed");
     assert_eq!(result.unwrap_err(), Errno::EINVAL);
 }
 

test/sys/test_socket.rs

@@ -204,7 +204,7 @@ pub fn test_addr_equality_path() {
 pub fn test_abstract_sun_path_too_long() {
     let name = String::from("nix\0abstract\0tesnix\0abstract\0tesnix\0abstract\0tesnix\0abstract\0tesnix\0abstract\0testttttnix\0abstract\0test\0make\0sure\0this\0is\0long\0enough");
     let addr = UnixAddr::new_abstract(name.as_bytes());
-    assert!(addr.is_err());
+    addr.expect_err("assertion failed");
 }
 
 #[cfg(any(target_os = "android", target_os = "linux"))]

test/sys/test_termios.rs

@@ -22,7 +22,7 @@ fn test_tcgetattr_pty() {
     let _m = crate::PTSNAME_MTX.lock();
 
     let pty = openpty(None, None).expect("openpty failed");
-    assert!(termios::tcgetattr(pty.slave).is_ok());
+    termios::tcgetattr(pty.slave).expect("assert failed");
     close(pty.master).expect("closing the master failed");
     close(pty.slave).expect("closing the slave failed");
 }

test/sys/test_uio.rs

@@ -41,29 +41,22 @@ fn test_writev() {
         consumed += slice_len;
     }
     let pipe_res = pipe();
-    assert!(pipe_res.is_ok());
-    let (reader, writer) = pipe_res.ok().unwrap();
+    let (reader, writer) = pipe_res.expect("Couldn't create pipe");
     // FileDesc will close its filedesc (reader).
     let mut read_buf: Vec<u8> = iter::repeat(0u8).take(128 * 16).collect();
     // Blocking io, should write all data.
     let write_res = writev(writer, &iovecs);
-    // Successful write
-    assert!(write_res.is_ok());
-    let written = write_res.ok().unwrap();
+    let written = write_res.expect("couldn't write");
     // Check whether we written all data
     assert_eq!(to_write.len(), written);
     let read_res = read(reader, &mut read_buf[..]);
-    // Successful read
-    assert!(read_res.is_ok());
-    let read = read_res.ok().unwrap() as usize;
+    let read = read_res.expect("couldn't read");
     // Check we have read as much as we written
     assert_eq!(read, written);
     // Check equality of written and read data
     assert_eq!(&to_write, &read_buf);
-    let close_res = close(writer);
-    assert!(close_res.is_ok());
-    let close_res = close(reader);
-    assert!(close_res.is_ok());
+    close(writer).expect("closed writer");
+    close(reader).expect("closed reader");
 }
 
 #[test]
@@ -92,16 +85,10 @@ fn test_readv() {
     for v in &mut storage {
         iovecs.push(IoSliceMut::new(&mut v[..]));
     }
-    let pipe_res = pipe();
-    assert!(pipe_res.is_ok());
-    let (reader, writer) = pipe_res.ok().unwrap();
+    let (reader, writer) = pipe().expect("couldn't create pipe");
     // Blocking io, should write all data.
-    let write_res = write(writer, &to_write);
-    // Successful write
-    assert!(write_res.is_ok());
-    let read_res = readv(reader, &mut iovecs[..]);
-    assert!(read_res.is_ok());
-    let read = read_res.ok().unwrap();
+    write(writer, &to_write).expect("write failed");
+    let read = readv(reader, &mut iovecs[..]).expect("read failed");
     // Check whether we've read all data
     assert_eq!(to_write.len(), read);
     // Cccumulate data from iovecs
@@ -113,10 +100,8 @@ fn test_readv() {
     assert_eq!(read_buf.len(), to_write.len());
     // Check equality of written and read data
     assert_eq!(&read_buf, &to_write);
-    let close_res = close(reader);
-    assert!(close_res.is_ok());
-    let close_res = close(writer);
-    assert!(close_res.is_ok());
+    close(reader).expect("couldn't close reader");
+    close(writer).expect("couldn't close writer");
 }
 
 #[test]

test/sys/test_wait.rs

@@ -167,17 +167,17 @@ mod ptrace {
             Ok(WaitStatus::Stopped(child, SIGTRAP))
         );
         // We want to test a syscall stop and a PTRACE_EVENT stop
-        assert!(ptrace::setoptions(
+        ptrace::setoptions(
             child,
-            Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT
+            Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT,
         )
-        .is_ok());
+        .expect("setoptions failed");
 
         // First, stop on the next system call, which will be exit()
-        assert!(ptrace::syscall(child, None).is_ok());
+        ptrace::syscall(child, None).expect("syscall failed");
         assert_eq!(waitpid(child, None), Ok(WaitStatus::PtraceSyscall(child)));
         // Then get the ptrace event for the process exiting
-        assert!(ptrace::cont(child, None).is_ok());
+        ptrace::cont(child, None).expect("cont failed");
         assert_eq!(
             waitpid(child, None),
             Ok(WaitStatus::PtraceEvent(
@@ -187,7 +187,7 @@ mod ptrace {
             ))
         );
         // Finally get the normal wait() result, now that the process has exited
-        assert!(ptrace::cont(child, None).is_ok());
+        ptrace::cont(child, None).expect("cont failed");
         assert_eq!(waitpid(child, None), Ok(WaitStatus::Exited(child, 0)));
     }
 
@@ -202,20 +202,20 @@ mod ptrace {
             Ok(WaitStatus::PtraceEvent(child, SIGTRAP, 0)),
         );
         // We want to test a syscall stop and a PTRACE_EVENT stop
-        assert!(ptrace::setoptions(
+        ptrace::setoptions(
             child,
-            Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT
+            Options::PTRACE_O_TRACESYSGOOD | Options::PTRACE_O_TRACEEXIT,
         )
-        .is_ok());
+        .expect("setopts failed");
 
         // First, stop on the next system call, which will be exit()
-        assert!(ptrace::syscall(child, None).is_ok());
+        ptrace::syscall(child, None).expect("syscall failed");
         assert_eq!(
             waitid(Id::Pid(child), WaitPidFlag::WEXITED),
             Ok(WaitStatus::PtraceSyscall(child)),
         );
         // Then get the ptrace event for the process exiting
-        assert!(ptrace::cont(child, None).is_ok());
+        ptrace::cont(child, None).expect("cont failed");
         assert_eq!(
             waitid(Id::Pid(child), WaitPidFlag::WEXITED),
             Ok(WaitStatus::PtraceEvent(
@@ -225,7 +225,7 @@ mod ptrace {
             )),
         );
         // Finally get the normal wait() result, now that the process has exited
-        assert!(ptrace::cont(child, None).is_ok());
+        ptrace::cont(child, None).expect("cont failed");
         assert_eq!(
             waitid(Id::Pid(child), WaitPidFlag::WEXITED),
             Ok(WaitStatus::Exited(child, 0)),

test/test_fcntl.rs

@@ -492,10 +492,8 @@ mod test_posix_fadvise {
     fn test_success() {
         let tmp = NamedTempFile::new().unwrap();
         let fd = tmp.as_raw_fd();
-        let res =
-            posix_fadvise(fd, 0, 100, PosixFadviseAdvice::POSIX_FADV_WILLNEED);
-
-        assert!(res.is_ok());
+        posix_fadvise(fd, 0, 100, PosixFadviseAdvice::POSIX_FADV_WILLNEED)
+            .expect("posix_fadvise failed");
     }
 
     #[test]