diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-07 05:18:03 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-07 05:18:03 +0530 |
commit | 0b951f65b969ccc3445079a70686cf2146e365d7 (patch) | |
tree | b10751885c1b2b17245f072e1c30d2abade7294b | |
parent | 4cc241c858ce8ee7894495d082a3bfc6233d80e8 (diff) | |
parent | 808244df63be5d68ad7784a3bddf62a4b860594b (diff) | |
download | servo-0b951f65b969ccc3445079a70686cf2146e365d7.tar.gz servo-0b951f65b969ccc3445079a70686cf2146e365d7.zip |
Auto merge of #10447 - antrik:update-ipc_channel-5, r=jdm
Update ipc-channel for two important bug fixes
This fixes https://github.com/servo/servo/issues/10260 by pulling in
https://github.com/servo/ipc-channel/pull/61 (fix receive for messages
close to packet size) and https://github.com/servo/ipc-channel/pull/62
(properly handle ENOBUFS); where the latter is not critical per se, as
there was a workaround already -- but that workaround aggrevated the
first bug, resulting in the urgent issue...
This bump requires a tidy override for `uuid`: `ipc-channel` was updated
to `uuid 0.2` in https://github.com/servo/ipc-channel/pull/63 (don't
know why...), while other crates are still with `0.1`. That was blocking
this urgent bug fix; and according to a discussion with @mbrubeck on
IRC, the override should be OK in this case.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10447)
<!-- Reviewable:end -->
-rw-r--r-- | components/servo/Cargo.lock | 12 | ||||
-rw-r--r-- | ports/cef/Cargo.lock | 12 | ||||
-rw-r--r-- | ports/geckolib/Cargo.lock | 12 | ||||
-rw-r--r-- | ports/gonk/Cargo.lock | 12 | ||||
-rw-r--r-- | python/tidy.py | 2 |
5 files changed, 41 insertions, 9 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index aca54108e89..c79dc272bb8 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -976,7 +976,7 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.2.1" -source = "git+https://github.com/servo/ipc-channel#0774ccb79b1b2c2c7518e0d14010c1ab3e5c247d" +source = "git+https://github.com/servo/ipc-channel#f85a07bdb2615e439bee7308d37266ac3dd23708" dependencies = [ "bincode 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -985,7 +985,7 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2232,6 +2232,14 @@ dependencies = [ ] [[package]] +name = "uuid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "void" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 03366249b70..bc67f473a43 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -895,7 +895,7 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.2.1" -source = "git+https://github.com/servo/ipc-channel#0774ccb79b1b2c2c7518e0d14010c1ab3e5c247d" +source = "git+https://github.com/servo/ipc-channel#f85a07bdb2615e439bee7308d37266ac3dd23708" dependencies = [ "bincode 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -904,7 +904,7 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2100,6 +2100,14 @@ dependencies = [ ] [[package]] +name = "uuid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "void" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index ca7d81e2d47..2102a17139f 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -191,7 +191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ipc-channel" version = "0.2.1" -source = "git+https://github.com/servo/ipc-channel#0774ccb79b1b2c2c7518e0d14010c1ab3e5c247d" +source = "git+https://github.com/servo/ipc-channel#f85a07bdb2615e439bee7308d37266ac3dd23708" dependencies = [ "bincode 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -200,7 +200,7 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -515,6 +515,14 @@ dependencies = [ ] [[package]] +name = "uuid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "void" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 9fdf2692190..eb6108a1a7d 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -877,7 +877,7 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.2.1" -source = "git+https://github.com/servo/ipc-channel#0774ccb79b1b2c2c7518e0d14010c1ab3e5c247d" +source = "git+https://github.com/servo/ipc-channel#f85a07bdb2615e439bee7308d37266ac3dd23708" dependencies = [ "bincode 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -886,7 +886,7 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2080,6 +2080,14 @@ dependencies = [ ] [[package]] +name = "uuid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "void" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/python/tidy.py b/python/tidy.py index 0d6ef40f01a..ea7062dd1b1 100644 --- a/python/tidy.py +++ b/python/tidy.py @@ -220,7 +220,7 @@ def check_lock(file_name, contents): raise StopIteration # package names to be neglected (as named by cargo) - exceptions = ["bitflags", "xml-rs", "gl_generator", "byteorder"] + exceptions = ["bitflags", "xml-rs", "gl_generator", "byteorder", "uuid"] import toml content = toml.loads(contents) |