Merge pull request #41 from ChrisRega/0.5.0-dev

Update json-diff library with array support, bump version for release…

Cargo.toml

@@ -4,7 +4,7 @@ description = "A flexible rule-based file and folder comparison tool and crate i
 repository = "https://github.com/VolumeGraphics/havocompare"
 homepage = "https://github.com/VolumeGraphics/havocompare"
 documentation = "https://docs.rs/havocompare"
-version = "0.5.0-RC2"
+version = "0.5.0"
 edition = "2021"
 license = "MIT"
 authors = ["Volume Graphics GmbH"]
@@ -47,7 +47,7 @@ tempfile = "3.8"
 fs_extra = "1.3"
 opener = "0.6"
 anyhow = "1.0"
-json_diff_ng = {version = "0.3.0-rc1"}
+json_diff_ng = {version = "0.3.0"}
 
 
 [dev-dependencies]

README.md

@@ -247,7 +247,7 @@ rules:
 ## Changelog
 
 ### 0.5.0
-- Add basic JSON checking
+- Add JSON checking
 
 ### 0.4.0
 - Separate reporting logic from comparison logic

src/csv/tokenizer/mod.rs

@@ -66,7 +66,7 @@ impl SpecialCharacter {
 
 impl PartialOrd<Self> for SpecialCharacter {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.get_position().partial_cmp(&other.get_position())
+        Some(self.cmp(other))
     }
 }
 

src/json.rs

@@ -106,7 +106,7 @@ mod test {
     use super::*;
 
     fn trim_split(list: &str) -> Vec<&str> {
-        list.split("\n").map(|e| e.trim()).collect()
+        list.split('\n').map(|e| e.trim()).collect()
     }
 
     #[test]

src/lib.rs

@@ -281,7 +281,7 @@ fn process_rule(
     let mut all_okay = true;
     nominal_cleaned_paths
         .into_iter()
-        .zip(actual_cleaned_paths.into_iter())
+        .zip(actual_cleaned_paths)
         .for_each(|(n, a)| {
             let compare_result = process_file(n, a, rule);
             all_okay &= !compare_result.is_error;