diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-09 01:36:35 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-09 01:36:35 +0530 |
| commit | f4aa5b42ea3c0ece91018964df88a0b6e86649dd (patch) | |
| tree | 1fba15152778a22269f3c304a12f0d7f8f98d488 | |
| parent | d01d20d50cb4df2894f0d5e1f944bfa143f18ef2 (diff) | |
| parent | 07d837bd030c52cfa8dc27e07c18156ad37400dd (diff) | |
| download | servo-f4aa5b42ea3c0ece91018964df88a0b6e86649dd.tar.gz servo-f4aa5b42ea3c0ece91018964df88a0b6e86649dd.zip | |
Auto merge of #8893 - Ms2ger:byteorder, r=frewsxcv
Update bincode.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8893)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 9 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 9 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 9 | ||||
| -rw-r--r-- | python/tidy.py | 2 |
4 files changed, 7 insertions, 22 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index ade64f4a378..c77773b52ae 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "bincode" version = "0.4.0" -source = "git+https://github.com/TyOverby/bincode#c1d94fe8590a91c1f5f163d7d3f23df2c84f0d21" +source = "git+https://github.com/TyOverby/bincode#590a862b4368910a5285ca8e970163f21a752b8d" dependencies = [ - "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -138,11 +138,6 @@ source = "git+https://github.com/ende76/brotli-rs#4a8c42cce771ded65fe64d6816f5d7 [[package]] name = "byteorder" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "byteorder" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 21331e2b8d3..ce4b2c17921 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -102,9 +102,9 @@ dependencies = [ [[package]] name = "bincode" version = "0.4.0" -source = "git+https://github.com/TyOverby/bincode#c1d94fe8590a91c1f5f163d7d3f23df2c84f0d21" +source = "git+https://github.com/TyOverby/bincode#590a862b4368910a5285ca8e970163f21a752b8d" dependencies = [ - "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -127,11 +127,6 @@ source = "git+https://github.com/ende76/brotli-rs#4a8c42cce771ded65fe64d6816f5d7 [[package]] name = "byteorder" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "byteorder" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index c8fa85c7054..9d6127f77c9 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "bincode" version = "0.4.0" -source = "git+https://github.com/TyOverby/bincode#c1d94fe8590a91c1f5f163d7d3f23df2c84f0d21" +source = "git+https://github.com/TyOverby/bincode#590a862b4368910a5285ca8e970163f21a752b8d" dependencies = [ - "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -118,11 +118,6 @@ source = "git+https://github.com/ende76/brotli-rs#4a8c42cce771ded65fe64d6816f5d7 [[package]] name = "byteorder" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "byteorder" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/python/tidy.py b/python/tidy.py index ac47ffb76be..645749750aa 100644 --- a/python/tidy.py +++ b/python/tidy.py @@ -170,7 +170,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["libc", "byteorder", "cocoa"] + exceptions = ["libc", "cocoa"] import toml content = toml.loads(contents) |