Merge branch 'main' into 0.6.0-more-image-compare-options

VolumeGraphics · May 5, 2024 · 157720c · 157720c
2 parents f8efb40 + 9104d1e
commit 157720c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Compile and release
-        uses: rust-build/[email protected].4
+        uses: rust-build/[email protected].5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/Cargo.toml b/Cargo.toml
@@ -50,7 +50,6 @@ opener = "0.7"
 anyhow = "1.0"
 json_diff_ng = { version = "0.5" }
 
-
 [dev-dependencies]
 env_logger = "0.11"
 tracing = { version = "0.1", default-features = false }

diff --git a/src/lib.rs b/src/lib.rs
@@ -380,6 +380,7 @@ pub fn validate_config(config_file: impl AsRef<Path>) -> bool {
 mod tests {
     use super::*;
     use crate::image::{CompareMode, RGBCompareMode};
+
     #[test]
     fn folder_not_found_is_false() {
         let rule = Rule {

diff --git a/src/main.rs b/src/main.rs
@@ -99,9 +99,9 @@ fn main() -> Result<(), vg_errortools::MainError> {
             actual,
             config,
         } => {
-            let config: ComparisonMode = serde_json::from_str(&config)
-                .map_err(|e| format!("Couldn't deserialize the config string: {e}"))
-                .unwrap();
+            use anyhow::Context;
+            let config: ComparisonMode =
+                serde_json::from_str(&config).context("Couldn't deserialize the config string")?;
             let result = compare_files(nominal, actual, &config);
             info!("Diff results: {result:#?}");
             if result.is_error {