diff --git a/Cargo.lock b/Cargo.lock index 5184b7b26..9405c0a4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -1501,13 +1501,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -1516,7 +1516,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] @@ -1525,6 +1525,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "roff" version = "0.2.1" diff --git a/lib/src/diff.rs b/lib/src/diff.rs index 06ae6e4ec..9e3e62f30 100644 --- a/lib/src/diff.rs +++ b/lib/src/diff.rs @@ -635,9 +635,15 @@ pub fn diff<'a>(left: &'a [u8], right: &'a [u8]) -> Vec> { mod tests { use super::*; + // Extracted to a function because type inference is ambiguous due to + // `impl PartialEq for std::ops::Range` + fn no_ranges() -> Vec> { + vec![] + } + #[test] fn test_find_line_ranges_empty() { - assert_eq!(find_line_ranges(b""), vec![]); + assert_eq!(find_line_ranges(b""), no_ranges()); } #[test] @@ -657,7 +663,7 @@ mod tests { #[test] fn test_find_word_ranges_empty() { - assert_eq!(find_word_ranges(b""), vec![]); + assert_eq!(find_word_ranges(b""), no_ranges()); } #[test] @@ -667,7 +673,7 @@ mod tests { #[test] fn test_find_word_ranges_no_word() { - assert_eq!(find_word_ranges(b"+-*/"), vec![]); + assert_eq!(find_word_ranges(b"+-*/"), no_ranges()); } #[test]