1 files changed, 27 insertions, 35 deletions
diff --git a/test/test_stat.rs b/test/test_stat.rs
index 900def89..a65778ea 100644
--- a/test/test_stat.rs
+++ b/test/test_stat.rs
@@ -21,44 +21,36 @@ fn valid_uid_gid(stat: FileStat) -> bool {
 }
 
 fn assert_stat_results(stat_result: Result<FileStat>) {
-    match stat_result {
-        Ok(stats) => {
-            assert!(stats.st_dev > 0);      // must be positive integer, exact number machine dependent
-            assert!(stats.st_ino > 0);      // inode is positive integer, exact number machine dependent
-            assert!(stats.st_mode > 0);     // must be positive integer
-            assert!(stats.st_nlink == 1);   // there links created, must be 1
-            assert!(valid_uid_gid(stats));  // must be positive integers
-            assert!(stats.st_size == 0);    // size is 0 because we did not write anything to the file
-            assert!(stats.st_blksize > 0);  // must be positive integer, exact number machine dependent
-            assert!(stats.st_blocks <= 16);  // Up to 16 blocks can be allocated for a blank file
-        }
-        Err(_) => panic!("stat call failed") // if stats system call fails, something is seriously wrong on that machine
-    }
+    let stats = stat_result.expect("stat call failed");
+    assert!(stats.st_dev > 0);      // must be positive integer, exact number machine dependent
+    assert!(stats.st_ino > 0);      // inode is positive integer, exact number machine dependent
+    assert!(stats.st_mode > 0);     // must be positive integer
+    assert!(stats.st_nlink == 1);   // there links created, must be 1
+    assert!(valid_uid_gid(stats));  // must be positive integers
+    assert!(stats.st_size == 0);    // size is 0 because we did not write anything to the file
+    assert!(stats.st_blksize > 0);  // must be positive integer, exact number machine dependent
+    assert!(stats.st_blocks <= 16);  // Up to 16 blocks can be allocated for a blank file
 }
 
 fn assert_lstat_results(stat_result: Result<FileStat>) {
-    match stat_result {
-        Ok(stats) => {
-            assert!(stats.st_dev > 0);      // must be positive integer, exact number machine dependent
-            assert!(stats.st_ino > 0);      // inode is positive integer, exact number machine dependent
-            assert!(stats.st_mode > 0);     // must be positive integer
-
-            // st_mode is c_uint (u32 on Android) while S_IFMT is mode_t
-            // (u16 on Android), and that will be a compile error.
-            // On other platforms they are the same (either both are u16 or u32).
-            assert!((stats.st_mode as usize) & (S_IFMT as usize) == S_IFLNK as usize); // should be a link
-            assert!(stats.st_nlink == 1);   // there links created, must be 1
-            assert!(valid_uid_gid(stats));  // must be positive integers
-            assert!(stats.st_size > 0);    // size is > 0 because it points to another file
-            assert!(stats.st_blksize > 0);  // must be positive integer, exact number machine dependent
-
-            // st_blocks depends on whether the machine's file system uses fast
-            // or slow symlinks, so just make sure it's not negative
-            // (Android's st_blocks is ulonglong which is always non-negative.)
-            assert!(stats.st_blocks >= 0);
-        }
-        Err(_) => panic!("stat call failed") // if stats system call fails, something is seriously wrong on that machine
-    }
+    let stats = stat_result.expect("stat call failed");
+    assert!(stats.st_dev > 0);      // must be positive integer, exact number machine dependent
+    assert!(stats.st_ino > 0);      // inode is positive integer, exact number machine dependent
+    assert!(stats.st_mode > 0);     // must be positive integer
+
+    // st_mode is c_uint (u32 on Android) while S_IFMT is mode_t
+    // (u16 on Android), and that will be a compile error.
+    // On other platforms they are the same (either both are u16 or u32).
+    assert!((stats.st_mode as usize) & (S_IFMT as usize) == S_IFLNK as usize); // should be a link
+    assert!(stats.st_nlink == 1);   // there links created, must be 1
+    assert!(valid_uid_gid(stats));  // must be positive integers
+    assert!(stats.st_size > 0);    // size is > 0 because it points to another file
+    assert!(stats.st_blksize > 0);  // must be positive integer, exact number machine dependent
+
+    // st_blocks depends on whether the machine's file system uses fast
+    // or slow symlinks, so just make sure it's not negative
+    // (Android's st_blocks is ulonglong which is always non-negative.)
+    assert!(stats.st_blocks >= 0);
 }
 
 #[test]