Remove dev-dependency diff

Cargo.lock

@@ -324,12 +324,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
 [[package]]
 name = "dissimilar"
 version = "1.0.7"
@@ -1711,7 +1705,7 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 name = "salsa"
 version = "0.0.0"
 dependencies = [
- "diff",
+ "dissimilar",
  "expect-test",
  "indexmap",
  "linked-hash-map",

crates/salsa/Cargo.toml

@@ -25,8 +25,8 @@ triomphe = "0.1.11"
 salsa-macros = { version = "0.0.0", path = "salsa-macros" }
 
 [dev-dependencies]
-diff = "0.1.13"
 linked-hash-map = "0.5.6"
 rand = "0.8.5"
 test-log = "0.2.14"
 expect-test = "1.4.0"
+dissimilar = "1.0.7"

crates/salsa/tests/incremental/implementation.rs

@@ -33,11 +33,11 @@ impl TestContextImpl {
             return;
         }
 
-        for diff in diff::lines(expected_text, actual_text) {
+        for diff in dissimilar::diff(expected_text, actual_text) {
             match diff {
-                diff::Result::Left(l) => println!("-{}", l),
-                diff::Result::Both(l, _) => println!(" {}", l),
-                diff::Result::Right(r) => println!("+{}", r),
+                dissimilar::Chunk::Delete(l) => println!("-{}", l),
+                dissimilar::Chunk::Equal(l) => println!(" {}", l),
+                dissimilar::Chunk::Insert(r) => println!("+{}", r),
             }
         }