tests: unwrap to know where goes wrong

Author: zjp-CN

src/diff.rs

@@ -1,4 +1,4 @@
-use crate::{BoxStr, ProofKind, Result, SerFunction};
+use crate::{BoxStr, ProofKind, SerFunction};
 use indexmap::{IndexMap, IndexSet};
 use serde::{Deserialize, Serialize};
 use std::{
@@ -51,7 +51,7 @@ impl KaniListHarnesses {
         self.inner = inner;
     }
 
-    pub fn strip_path_prefix(&mut self, prefix: &str) -> Result<()> {
+    pub fn strip_path_prefix(&mut self, prefix: &str) {
         let mut map = IndexMap::with_capacity(self.inner.len());
         for (key, val) in self.inner.iter_mut() {
             let val = std::mem::take(val);
@@ -69,7 +69,6 @@ impl KaniListHarnesses {
         }
         map.sort_unstable_keys();
         self.inner = map;
-        Ok(())
     }
 
     pub fn strip_path_closure_name(&mut self, v_text: &[&str]) {
@@ -147,20 +146,21 @@ impl KaniListJson {
     }
 
     // FIXME: merge this and the raw one.
-    pub fn strip_path_prefix<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
-        let path = path.as_ref().canonicalize()?;
+    pub fn strip_path_prefix<P: AsRef<Path>>(&mut self, path: P) {
+        let path = path.as_ref();
+        let path = path
+            .canonicalize()
+            .unwrap_or_else(|err| panic!("Unable to canonicalize {path:?}:\n{err}"));
         let prefix = &format!("{}{MAIN_SEPARATOR}", path.to_str().unwrap());
 
-        self.standard_harnesses.strip_path_prefix(prefix)?;
-        self.contract_harnesses.strip_path_prefix(prefix)?;
-        Ok(())
+        self.standard_harnesses.strip_path_prefix(prefix);
+        self.contract_harnesses.strip_path_prefix(prefix);
     }
 
     /// This function is used in tests.
-    pub fn strip_path_prefix_raw(&mut self, prefix: &str) -> Result<()> {
-        self.standard_harnesses.strip_path_prefix(prefix)?;
-        self.contract_harnesses.strip_path_prefix(prefix)?;
-        Ok(())
+    pub fn strip_path_prefix_raw(&mut self, prefix: &str) {
+        self.standard_harnesses.strip_path_prefix(prefix);
+        self.contract_harnesses.strip_path_prefix(prefix);
     }
 
     pub fn strip_path_closure_name(&mut self, text: &[&str]) {

tests/kani_list.rs

@@ -37,21 +37,21 @@ fn validate_kani_list_json() -> Result<()> {
     Ok(())
 }
 
-fn read_kani_list_json() -> Result<KaniListJson> {
+fn read_kani_list_json() -> KaniListJson {
     const KANI_LIST_JSON: &str = "assets/kani-list_verify-rust-std.json";
     const PREFIX: &str = "/home/gh-zjp-CN/distributed-verification/verify-rust-std/library/";
 
-    let mut kani_list: KaniListJson = read_file(KANI_LIST_JSON)?;
-    kani_list.strip_path_prefix_raw(PREFIX)?;
-    Ok(kani_list)
+    let mut kani_list: KaniListJson = read_file(KANI_LIST_JSON).unwrap();
+    kani_list.strip_path_prefix_raw(PREFIX);
+    kani_list
 }
 
 #[test]
-fn kani_list_json() -> Result<()> {
-    let kani_list = read_kani_list_json()?;
+fn kani_list_json() {
+    let kani_list = read_kani_list_json();
 
     expect_file!["snapshots/kani_list/kani_list_json-files.json"]
-        .assert_eq(&serde_json::to_string_pretty(&kani_list.files())?);
+        .assert_eq(&serde_json::to_string_pretty(&kani_list.files()).unwrap());
 
     expect![[r#"
         Totals {
@@ -61,6 +61,4 @@ fn kani_list_json() -> Result<()> {
         }
     "#]]
     .assert_debug_eq(&kani_list.totals);
-
-    Ok(())
 }

tests/verify-rust-std.rs

@@ -8,23 +8,23 @@ const PREFIX_LOCAL_DIR: &str = "/home/gh-zjp-CN/distributed-verification/";
 const PREFIX_CI_DIR: &str = "/home/runner/work/distributed-verification/distributed-verification/";
 
 /// Read kani-list.json generated from verify-rust-std CI.
-fn read_kani_list_json() -> Result<KaniListJson> {
+fn read_kani_list_json() -> KaniListJson {
     const KANI_LIST_JSON: &str = "tmp/ubuntu-latest-kani-list.json/kani-list.json";
     const PREFIX: &str = "/home/runner/work/verify-rust-std/verify-rust-std/library/";
 
-    let mut kani_list: KaniListJson = read_file(KANI_LIST_JSON)?;
+    let mut kani_list: KaniListJson = read_file(KANI_LIST_JSON).unwrap();
     kani_list.normalize_file_path();
-    kani_list.strip_path_prefix_raw(PREFIX)?;
+    kani_list.strip_path_prefix_raw(PREFIX);
     kani_list.strip_path_closure_name(&[PREFIX, PREFIX_LOCAL_DIR, PREFIX_CI_DIR]);
-    Ok(kani_list)
+    kani_list
 }
 
-fn read_core_json() -> Result<Vec<SerFunction>> {
+fn read_core_json() -> Vec<SerFunction> {
     const CORE_JSON: &str = "./assets/core.json";
     const PREFIX_LOCAL: &str = "/home/gh-zjp-CN/distributed-verification/verify-rust-std/library/";
     const PREFIX_CI: &str = "/home/runner/work/distributed-verification/distributed-verification/verify-rust-std/library/";
 
-    let mut v: Vec<SerFunction> = read_file(CORE_JSON)?;
+    let mut v: Vec<SerFunction> = read_file(CORE_JSON).unwrap();
     for func in &mut v {
         // strip_path_closure_name
         func.name = func
@@ -35,12 +35,12 @@ fn read_core_json() -> Result<Vec<SerFunction>> {
             .replace(PREFIX_CI_DIR, "")
             .into();
     }
-    Ok(v)
+    v
 }
 
 #[test]
-fn core_json() -> Result<()> {
-    let v_func = read_core_json()?;
+fn core_json() {
+    let v_func = read_core_json();
     let merged = MergedHarnesses::new(&v_func);
 
     #[derive(Debug)]
@@ -58,13 +58,11 @@ fn core_json() -> Result<()> {
         }
     "#]]
     .assert_debug_eq(&count);
-
-    Ok(())
 }
 
 #[test]
-fn read() -> Result<()> {
-    let kani_list = read_kani_list_json()?;
+fn read() {
+    let kani_list = read_kani_list_json();
     expect![[r#"
         Totals {
             standard_harnesses: 8350,
@@ -77,7 +75,7 @@ fn read() -> Result<()> {
     let harness_names = kani_list.harness_names(|file, _| file.starts_with("core/"));
     expect_file!["snapshots/verify-rust-std/harness_names.txt"].assert_debug_eq(&harness_names);
 
-    let v_func = read_core_json()?;
+    let v_func = read_core_json();
     let merged = MergedHarnesses::new(&v_func);
 
     let function_names = merged.function_names(|f| f.file.starts_with("core/"));
@@ -89,6 +87,4 @@ fn read() -> Result<()> {
         .collect();
     expect_file!["snapshots/verify-rust-std/names_not_in_functions.txt"]
         .assert_debug_eq(&names_not_in_functions);
-
-    Ok(())
 }