From da3d2f57dacaec5dc51a4cd6fa31e78b42dcda42 Mon Sep 17 00:00:00 2001 From: Marcus Klaas Date: Mon, 14 Sep 2015 20:17:51 +0200 Subject: [PATCH] Bump diff.rs version This should make the computation of diffs quite a bit faster, which is particularly noticable in tests. --- Cargo.lock | 53 ++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 4 +++- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 30f07fd4f98..b0f1f478df3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,48 +2,56 @@ name = "rustfmt" version = "0.0.1" dependencies = [ - "diff 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "diff 0.1.5 (git+https://github.com/utkarshkukreti/diff.rs.git)", "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "strings 0.0.1 (git+https://github.com/nrc/strings.rs.git)", "term 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "aho-corasick" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "diff" version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/utkarshkukreti/diff.rs.git#1921576a73e1b50a0ecb26c8ce62eefb26d273b4" [[package]] name = "kernel32-sys" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "memchr" -version = "0.1.3" +name = "log" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "memchr" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -51,25 +59,28 @@ name = "regex" version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-serialize" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "strings" version = "0.0.1" -source = "git+https://github.com/nrc/strings.rs.git#6d748148fbe3bf2d9e5ac2ede65ac503d7491a4f" +source = "git+https://github.com/nrc/strings.rs.git#78ba5d802102e4f46f03c5eb835a53106a4d35f7" +dependencies = [ + "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "term" @@ -77,15 +88,15 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "toml" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -95,7 +106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9cb4f929344..8d0952ab109 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,9 @@ toml = "0.1.20" rustc-serialize = "0.3.14" unicode-segmentation = "0.1.2" regex = "0.1.41" -diff = "0.1.5" term = "0.2.11" +[dependencies.diff] +git = "https://github.com/utkarshkukreti/diff.rs.git" + [dev-dependencies]