diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-07 14:18:50 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-07 14:18:50 -0800 |
commit | 96698dd05119ced20c4768630b50aab82f5fb86c (patch) | |
tree | 6a204b71f2bc87c772561917fd44209b298d96d3 | |
parent | c48a326fb37976ec9e808825c9641602bccefa56 (diff) | |
parent | 916564f931d93a61c3e4893a330da3b564f43df8 (diff) | |
download | servo-96698dd05119ced20c4768630b50aab82f5fb86c.tar.gz servo-96698dd05119ced20c4768630b50aab82f5fb86c.zip |
Auto merge of #15433 - mbrubeck:always-be-updating, r=KiChjang
Update a few dependencies
This adds two new crates to the dependency graph: [error-chain] and [metadeps], which are both dual-licensed (MIT/Apache-2.0).
[error-chain]: https://crates.io/crates/error-chain
[metadeps]: https://crates.io/crates/metadeps
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15433)
<!-- Reviewable:end -->
-rw-r--r-- | Cargo.lock | 47 | ||||
-rw-r--r-- | components/gfx/Cargo.toml | 2 | ||||
-rw-r--r-- | components/script/Cargo.toml | 2 | ||||
-rw-r--r-- | servo-tidy.toml | 2 |
4 files changed, 35 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock index b5817750ad7..e16629d24ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,7 +113,7 @@ dependencies = [ "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "servo-skia 0.30000001.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -701,7 +701,7 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "webrender_traits 0.14.0 (git+https://github.com/servo/webrender)", - "x11 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -821,6 +821,11 @@ dependencies = [ ] [[package]] +name = "error-chain" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "euclid" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -983,7 +988,7 @@ dependencies = [ "truetype 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.14.0 (git+https://github.com/servo/webrender)", - "xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1064,7 +1069,7 @@ dependencies = [ "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.14.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1555,6 +1560,16 @@ dependencies = [ ] [[package]] +name = "metadeps" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "mime" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1846,7 +1861,7 @@ dependencies = [ "serde 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2234,7 +2249,7 @@ dependencies = [ "audio-video-metadata 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bluetooth_traits 0.0.1", - "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "canvas_traits 0.0.1", "caseless 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2522,7 +2537,7 @@ dependencies = [ "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11-dl 2.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2542,7 +2557,7 @@ dependencies = [ "servo-fontconfig-sys 4.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "servo-glutin 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3267,16 +3282,16 @@ dependencies = [ [[package]] name = "x11" -version = "2.11.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "metadeps 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "x11-dl" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3291,7 +3306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "xi-unicode" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3389,6 +3404,7 @@ dependencies = [ "checksum energymon-sys 0.3.0 (git+https://github.com/energymon/energymon-sys.git)" = "<none>" "checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" "checksum env_logger 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99971fb1b635fe7a0ee3c4d065845bb93cca80a23b5613b5613391ece5de4144" +"checksum error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f" "checksum euclid 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f93a556290e09f379cbfaa4f75ac52a72a3d2deb7d04076f312cdb2e6acba28e" "checksum expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cef36cd1a8a02d28b91d97347c63247b9e4cb8a8e36df36f8201dc87a1c0859c" "checksum flate2 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4e4d0c15ef829cbc1b7cda651746be19cceeb238be7b1049227b14891df9e25" @@ -3442,6 +3458,7 @@ dependencies = [ "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" "checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4" +"checksum metadeps 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829fffe7ea1d747e23f64be972991bc516b2f1ac2ae4a3b33d8bea150c410151" "checksum mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5c93a4bd787ddc6e7833c519b73a50883deb5863d76d9b71eb8216fb7f94e66" "checksum mime_guess 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76da6df85047af8c0edfa53f48eb1073012ce1cc95c8fedc0a374f659a89dd65" "checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54" @@ -3572,9 +3589,9 @@ dependencies = [ "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum ws 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7c47e9ca2f5c47d27f731b1bb9bb50cc05f9886bb84fbd52afa0ff97f4f61b06" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -"checksum x11 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be719a282c8d2debd87999849347346259c58ff0acdac3f7f3b48b58652dd773" -"checksum x11-dl 2.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4e4c7f0a7fb861a1bde4aa23bbda9509bda6b87de4d47c322f86e4c88241ebdd" +"checksum x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "124eb405bf0262a54e1a982d4ffe4cd1c24261bdb306e49996e2ce7d492284a8" +"checksum x11-dl 2.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf1f9986368c9bbdd8191a783a7ceb42e0c9c6d3348616c873f829b3288a139c" "checksum xdg 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77b831a5ba77110f438f0ac5583aafeb087f70432998ba6b7dcb1d32185db453" -"checksum xi-unicode 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "315c4e158d7fa277e3ea35b32e50bc07e9a0c8de9130a7cc4bdeab42ddc7b442" +"checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" "checksum xml-rs 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b15eed12692bd59d15e98ee7f8dc8408465b992d8ddb4d1672c24865132ec7" "checksum xml5ever 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd22ccaa7c71c003165a5a4aabce8bb3f19a9378e399b03528e486954160ad5f" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 5a987a355f8..34ecfc2743a 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -39,7 +39,7 @@ style = {path = "../style"} style_traits = {path = "../style_traits"} time = "0.1.12" unicode-script = {version = "0.1", features = ["harfbuzz"]} -xi-unicode = "0.0.1" +xi-unicode = "0.1.0" [dependencies.webrender_traits] git = "https://github.com/servo/webrender" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 4a1a7d4d01d..16368dd1bb1 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -30,7 +30,7 @@ audio-video-metadata = "0.1.2" atomic_refcell = "0.1" bitflags = "0.7" bluetooth_traits = {path = "../bluetooth_traits"} -byteorder = "0.5" +byteorder = "1.0" canvas_traits = {path = "../canvas_traits"} caseless = "0.1.0" cookie = {version = "0.2.5", features = ["serialize-rustc"]} diff --git a/servo-tidy.toml b/servo-tidy.toml index e51428f80cc..b42cc23b619 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -31,7 +31,7 @@ num = [] [ignore] # Ignored packages with duplicated versions -packages = ["bitflags", "byteorder", "lazy_static", "semver"] +packages = ["bitflags", "byteorder", "semver"] # Files that are ignored for all tidy and lint checks. files = [ # Generated and upstream code combined with our own. Could use cleanup |