Skip to content
Open
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CLI = ["dep:clap"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
thiserror = "1.0"
thiserror = "2.0"
vg_errortools = "0.1"
serde_json = { version = "1.0", features = ["preserve_order"] }
diffs = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion src/mismatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl Mismatch {
&& self.right_only == DiffTreeNode::Null
}

pub fn all_diffs(&self) -> Vec<(DiffType, DiffEntry)> {
pub fn all_diffs(&self) -> Vec<(DiffType, DiffEntry<'_>)> {
let both = self
.unequal_values
.get_diffs()
Expand Down
19 changes: 5 additions & 14 deletions src/process.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use std::collections::HashMap;
use std::collections::HashSet;

use diffs::{Diff, myers, Replace};
use diffs::{myers, Diff, Replace};
use regex::Regex;
use serde_json::Map;
use serde_json::Value;

use crate::sort::preprocess_array;
use crate::DiffTreeNode;
use crate::Mismatch;
use crate::Result;
use crate::sort::preprocess_array;

/// Compares two string slices containing serialized json with each other, returns an error or a [`Mismatch`] structure holding all differences.
/// Internally this calls into [`compare_serde_values`] after deserializing the string slices into [`serde_json::Value`].
Expand Down Expand Up @@ -165,25 +165,16 @@ fn process_arrays(
&mut deleted,
&mut inserted,
));
myers::diff(
&mut diff,
a.as_slice(),
0,
a.len(),
b.as_slice(),
0,
b.len(),
)
.unwrap();
myers::diff(&mut diff, &*a, 0, a.len(), &*b, 0, b.len()).unwrap();

fn extract_one_sided_values(v: Vec<(usize, usize)>, vals: &[Value]) -> Vec<(usize, &Value)> {
v.into_iter()
.flat_map(|(o, ol)| (o..o + ol).map(|i| (i, &vals[i])))
.collect::<Vec<(usize, &Value)>>()
}

let left_only_values: Vec<_> = extract_one_sided_values(deleted, a.as_slice());
let right_only_values: Vec<_> = extract_one_sided_values(inserted, b.as_slice());
let left_only_values: Vec<_> = extract_one_sided_values(deleted, &a);
let right_only_values: Vec<_> = extract_one_sided_values(inserted, &b);

let mut left_only_nodes = values_to_node(left_only_values);
let mut right_only_nodes = values_to_node(right_only_values);
Expand Down
2 changes: 1 addition & 1 deletion src/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub(crate) fn preprocess_array<'a>(
sort_arrays: bool,
a: &'a Vec<Value>,
ignore_keys: &[Regex],
) -> Cow<'a, Vec<Value>> {
) -> Cow<'a, [Value]> {
if sort_arrays || !ignore_keys.is_empty() {
let mut owned = a.to_owned();
owned.sort_by(|a, b| compare_values(a, b, ignore_keys));
Expand Down