diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-31 10:47:49 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-31 10:47:49 -0600 |
| commit | 7e772857458f60a68346ac1a7020ae51d65959a1 (patch) | |
| tree | 35ccef569ed1137a06dae7bbddcb6c5083d58cdc | |
| parent | c4480b5d0309acc7f154166b91992f73a85de57f (diff) | |
| parent | 80867917af1152384f491e4a381258413ad6f3d5 (diff) | |
| download | servo-7e772857458f60a68346ac1a7020ae51d65959a1.tar.gz servo-7e772857458f60a68346ac1a7020ae51d65959a1.zip | |
Auto merge of #6869 - servo:unstable-h5e, r=metajack
Update rust-selectors and enable unstable features.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6869)
<!-- Reviewable:end -->
| -rw-r--r-- | components/servo/Cargo.lock | 10 | ||||
| -rw-r--r-- | components/style/Cargo.toml | 1 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 10 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 10 |
4 files changed, 22 insertions, 9 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index c1c4a62cd58..8415a423b61 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1126,9 +1126,13 @@ dependencies = [ ] [[package]] -name = "quicksort" +name = "quickersort" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", + "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "rand" @@ -1243,13 +1247,13 @@ dependencies = [ [[package]] name = "selectors" version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5" +source = "git+https://github.com/servo/rust-selectors#e4d0af9115b82e47890a67a678aaa27aa270f083" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 8f44f13e47b..79259bfb392 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -17,6 +17,7 @@ path = "../util" [dependencies.selectors] git = "https://github.com/servo/rust-selectors" +features = ["unstable"] [dependencies.cssparser] version = "0.3" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b4da44b4d8d..cdc711ab70a 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1110,9 +1110,13 @@ dependencies = [ ] [[package]] -name = "quicksort" +name = "quickersort" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", + "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "rand" @@ -1219,13 +1223,13 @@ dependencies = [ [[package]] name = "selectors" version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5" +source = "git+https://github.com/servo/rust-selectors#e4d0af9115b82e47890a67a678aaa27aa270f083" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 68248bf0a49..8c29e54d442 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1012,9 +1012,13 @@ dependencies = [ ] [[package]] -name = "quicksort" +name = "quickersort" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", + "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "rand" @@ -1121,13 +1125,13 @@ dependencies = [ [[package]] name = "selectors" version = "0.1.0" -source = "git+https://github.com/servo/rust-selectors#5d5c2ec6c9e703cb3d231b92fc962b330d2f67d5" +source = "git+https://github.com/servo/rust-selectors#e4d0af9115b82e47890a67a678aaa27aa270f083" dependencies = [ "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", |