v0.3.1-pre.007-fix.001

crates/ksp-store-api/tests/release_completeness.rs

@@ -83,15 +83,33 @@ fn pre_007_exact_crate_root_export_inventory_is_stable() {
 }
 
 #[test]
-fn pre_007_exact_production_module_inventory_is_raw_only() -> std::io::Result<()> {
+fn pre_007_exact_production_module_inventory_is_raw_only() {
     let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src");
-    assert_eq!(rust_file_names(root.as_path())?, std::vec!["capability.rs", "error.rs", "lib.rs", "model.rs"]);
+    let root_names = rust_file_names(root.as_path());
+    assert!(root_names.is_ok());
+    let root_names = match root_names {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(_) => return,
+    };
+    assert_eq!(root_names, std::vec!["capability.rs", "error.rs", "lib.rs", "model.rs"]);
+    let model_names = rust_file_names(root.join("model").as_path());
+    assert!(model_names.is_ok());
+    let model_names = match model_names {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(_) => return,
+    };
     assert_eq!(
-        rust_file_names(root.join("model").as_path())?,
+        model_names,
         std::vec!["raw_account.rs", "raw_outcome.rs", "raw_pagination.rs", "raw_primitives.rs", "raw_retention.rs", "raw_transaction.rs"]
     );
-    assert_eq!(rust_file_names(root.join("capability").as_path())?, std::vec!["raw_account.rs", "raw_retention.rs", "raw_transaction.rs"]);
-    return std::result::Result::Ok(());
+    let capability_names = rust_file_names(root.join("capability").as_path());
+    assert!(capability_names.is_ok());
+    let capability_names = match capability_names {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(_) => return,
+    };
+    assert_eq!(capability_names, std::vec!["raw_account.rs", "raw_retention.rs", "raw_transaction.rs"]);
+    return;
 }
 
 #[test]
@@ -208,11 +226,21 @@ fn assert_non_exhaustive(sources: &[&str], enum_name: &str) {
 }
 
 fn rust_file_names(directory: &std::path::Path) -> std::io::Result<std::vec::Vec<std::string::String>> {
-    let entries = std::fs::read_dir(directory)?;
+    let entries = match std::fs::read_dir(directory) {
+        std::result::Result::Ok(value) => value,
+        std::result::Result::Err(error) => return std::result::Result::Err(error),
+    };
     let mut names = std::vec::Vec::new();
     for entry in entries {
-        let entry = entry?;
-        if !entry.file_type()?.is_file() {
+        let entry = match entry {
+            std::result::Result::Ok(value) => value,
+            std::result::Result::Err(error) => return std::result::Result::Err(error),
+        };
+        let file_type = match entry.file_type() {
+            std::result::Result::Ok(value) => value,
+            std::result::Result::Err(error) => return std::result::Result::Err(error),
+        };
+        if !file_type.is_file() {
             continue;
         }
         let name = match entry.file_name().into_string() {