diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2024-02-07 16:34:21 +0100 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2024-02-07 16:34:21 +0100 |
| commit | 731b159f10af1c772a34accf1abe0c21ed1cbb73 (patch) | |
| tree | b11522ad5b1d46133d6f310868868ce939e53042 | |
| parent | e339c65a1a8f06e153ca0bf81c732f6b441eef45 (diff) | |
| download | rust-731b159f10af1c772a34accf1abe0c21ed1cbb73.tar.gz rust-731b159f10af1c772a34accf1abe0c21ed1cbb73.zip | |
Remove dev-dependency diff
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | crates/salsa/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/salsa/tests/incremental/implementation.rs | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4be85b1bc18..dc2bf3a7694 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,12 +325,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1711,7 +1705,7 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" name = "salsa" version = "0.0.0" dependencies = [ - "diff", + "dissimilar", "expect-test", "indexmap", "linked-hash-map", diff --git a/crates/salsa/Cargo.toml b/crates/salsa/Cargo.toml index 42885b47a6c..5cd351c0cab 100644 --- a/crates/salsa/Cargo.toml +++ b/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" diff --git a/crates/salsa/tests/incremental/implementation.rs b/crates/salsa/tests/incremental/implementation.rs index a9c0a4a018f..445154e85a0 100644 --- a/crates/salsa/tests/incremental/implementation.rs +++ b/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), } } |