commit 7b08c575a043c1f856464ca58d59010b22037c99
author Jiyong Park <jiyong@google.com> Tue Sep 14 07:28:56 2021 +0900
committer Jiyong Park <jiyong@google.com> Tue Sep 14 08:09:27 2021 +0900
tree 2a6dd35628ca6c57bafecdef2547095046cf28c2
parent 7f735a4484fab82be1dbc603bc6d7d257b3f6c6a

Don't expect a specific error kind

Upgrade to rustc 1.55.0 seems to have changed the error kind from Other
to Uncategorized. However, Uncategozied is a hidden error kind. Instead
of expecting a specific error kind, expect an error of any kind.

Bug: 199772260
Test: watch TH
Change-Id: Ia7066b0c06899cbaaf009bf7c4bcb3a4cc44121d

apkdmverity/src/main.rs

diff --git a/apkdmverity/src/main.rs b/apkdmverity/src/main.rs
index cabeb35..16490b6 100644
--- a/apkdmverity/src/main.rs
+++ b/apkdmverity/src/main.rs
@@ -240,8 +240,7 @@
         }
 
         run_test(modified_apk.as_slice(), idsig.as_ref(), "incorrect_apk", |ctx| {
-            let ret = fs::read(&ctx.result.mapper_device).map_err(|e| e.kind());
-            assert_eq!(ret, Err(std::io::ErrorKind::Other));
+            fs::read(&ctx.result.mapper_device).expect_err("Should fail");
         });
     }
 
@@ -261,8 +260,7 @@
         }
 
         run_test(apk.as_ref(), modified_idsig.as_slice(), "incorrect_merkle_tree", |ctx| {
-            let ret = fs::read(&ctx.result.mapper_device).map_err(|e| e.kind());
-            assert_eq!(ret, Err(std::io::ErrorKind::Other));
+            fs::read(&ctx.result.mapper_device).expect_err("Should fail");
         });
     }
 
@@ -284,9 +282,7 @@
             // Read around the modified location causes an error
             let f = File::open(&ctx.result.mapper_device).unwrap();
             let mut buf = vec![0; 10]; // just read 10 bytes
-            let ret = f.read_at(&mut buf, MODIFIED_OFFSET).map_err(|e| e.kind());
-            assert!(ret.is_err());
-            assert_eq!(ret, Err(std::io::ErrorKind::Other));
+            f.read_at(&mut buf, MODIFIED_OFFSET).expect_err("Should fail");
         });
     }