Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/csv/tokenizer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading