From 384d47d25e39b3e2cdbc2a8c28ec68abb709de64 Mon Sep 17 00:00:00 2001 From: Michael Baikov Date: Wed, 10 Aug 2022 08:55:45 +0800 Subject: Folloup for !1778, remove some of the less helpful error msgs --- test/sys/test_aio.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'test/sys/test_aio.rs') diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs index 12749b1d..6a36f3e7 100644 --- a/test/sys/test_aio.rs +++ b/test/sys/test_aio.rs @@ -101,8 +101,7 @@ mod aio_fsync { 0, SigevNotify::SigevNone, )); - let err = aiof.as_mut().submit(); - err.expect("assert failed"); + aiof.as_mut().submit().unwrap(); poll_aio!(&mut aiof).unwrap(); aiof.as_mut().aio_return().unwrap(); } @@ -148,8 +147,7 @@ mod aio_read { Box::pin(AioRead::new(fd, 2, &mut rbuf, 0, SigevNotify::SigevNone)); aior.as_mut().submit().unwrap(); - let cancelstat = aior.as_mut().cancel(); - cancelstat.expect("assert failed"); + aior.as_mut().cancel().unwrap(); // Wait for aiow to complete, but don't care whether it succeeded let _ = poll_aio!(&mut aior); @@ -341,8 +339,7 @@ mod aio_write { let err = aiow.as_mut().error(); assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS)); - let cancelstat = aiow.as_mut().cancel(); - cancelstat.expect("assert failed"); + aiow.as_mut().cancel().unwrap(); // Wait for aiow to complete, but don't care whether it succeeded let _ = poll_aio!(&mut aiow); @@ -564,8 +561,7 @@ fn test_aio_cancel_all() { let err = aiocb.as_mut().error(); assert!(err == Ok(()) || err == Err(Errno::EINPROGRESS)); - let cancelstat = aio_cancel_all(f.as_raw_fd()); - cancelstat.expect("assert failed"); + aio_cancel_all(f.as_raw_fd()).unwrap(); // Wait for aiocb to complete, but don't care whether it succeeded let _ = poll_aio!(&mut aiocb); -- cgit v1.2.3