Skip to content
This repository was archived by the owner on Nov 24, 2023. It is now read-only.

Switch to similar from difference #193

Merged
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ env_logger = "0.5.0-rc.1"
log = "0.4.1"
tempdir = "0.3.5"
proptest = "0.7.0"
difference = "2.0.0"
similar = "0.4.0"

[workspace]
36 changes: 18 additions & 18 deletions tests/parse_and_replace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,29 +97,29 @@ fn read_file(path: &Path) -> Result<String, Error> {
}

fn diff(expected: &str, actual: &str) -> String {
use difference::{Changeset, Difference};
use similar::text::{ChangeTag, TextDiff};
use std::fmt::Write;

let mut res = String::new();
let changeset = Changeset::new(expected.trim(), actual.trim(), "\n");
let diff = TextDiff::from_lines(expected.trim(), actual.trim());

let mut different = false;
for diff in changeset.diffs {
let (prefix, diff) = match diff {
Difference::Same(_) => continue,
Difference::Add(add) => ("+", add),
Difference::Rem(rem) => ("-", rem),
};
if !different {
write!(
&mut res,
"differences found (+ == actual, - == expected):\n"
)
.unwrap();
different = true;
}
for diff in diff.lines() {
writeln!(&mut res, "{} {}", prefix, diff).unwrap();
for op in diff.ops() {
for change in diff.iter_changes(op) {
let prefix = match change.tag() {
ChangeTag::Equal => continue,
ChangeTag::Insert => "+",
ChangeTag::Delete => "-",
};
if !different {
write!(
&mut res,
"differences found (+ == actual, - == expected):\n"
)
.unwrap();
different = true;
}
write!(&mut res, "{} {}", prefix, change.value()).unwrap();
}
}
if different {
Expand Down