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 /python/tidy.py | |
| 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 -->
Diffstat (limited to 'python/tidy.py')
| -rw-r--r-- | python/tidy.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |