From 341fc54313aa35980119868cb90854a91c1c6e63 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 19 May 2017 18:18:31 +0200 Subject: [PATCH] Work around CI bustage --- Cargo.lock | 7 ------- components/style/Cargo.toml | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d8527f796f1..2ef4d663720d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1834,15 +1834,9 @@ name = "nodrop" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "nodrop-union 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nodrop-union" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "nom" version = "1.2.4" @@ -3579,7 +3573,6 @@ dependencies = [ "checksum multistr 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "948d1285dd39981f6a5b1a72624c323312d29e2121682a742a87a773dd723bef" "checksum net2 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)" = "18b9642ad6222faf5ce46f6966f59b71b9775ad5758c9e09fcf0a6c8061972b4" "checksum nodrop 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbadd3f4c98dea0bd3d9b4be4c0cdaf1ab57035cb2e41fce3983db5add7cc5" -"checksum nodrop-union 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31761704eb6a5f68237db6081e628ac8c3af34eb57fb27fcdea790f6685f01f" "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" "checksum num-integer 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "ef1a4bf6f9174aa5783a9b4cc892cacd11aebad6c69ad027a0b65c6ca5f8aa37" "checksum num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 1edf7296d670..ef60be1ab18d 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -21,7 +21,11 @@ use_bindgen = ["bindgen", "regex", "toml"] servo = ["serde", "serde_derive", "heapsize", "heapsize_derive", "style_traits/servo", "servo_atoms", "servo_config", "html5ever", "cssparser/heapsize", "cssparser/serde", "encoding", "smallvec/heapsizeof", - "rayon/unstable", "servo_url", "arrayvec/use_union"] + + # FIXME: Uncomment when https://github.com/servo/servo/pull/16953 has landed: + #"arrayvec/use_union" + + "rayon/unstable", "servo_url"] testing = [] gecko_debug = ["nsstring_vendor/gecko_debug"]