diff options
-rw-r--r-- | Cargo.lock | 19 | ||||
-rw-r--r-- | components/style/Cargo.toml | 2 | ||||
-rw-r--r-- | components/style/lib.rs | 2 | ||||
-rw-r--r-- | components/style/stylist.rs | 4 |
4 files changed, 11 insertions, 16 deletions
diff --git a/Cargo.lock b/Cargo.lock index 6279b411797..af205d7f1cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2008,6 +2008,11 @@ dependencies = [ ] [[package]] +name = "pdqsort" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "phf" version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2146,16 +2151,6 @@ dependencies = [ ] [[package]] -name = "quickersort" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nodrop 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "quine-mc_cluskey" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2782,9 +2777,9 @@ dependencies = [ "ordered-float 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "pdqsort 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", - "quickersort 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3577,6 +3572,7 @@ dependencies = [ "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" "checksum parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e1435e7a2a00dfebededd6c6bdbd54008001e94b4a2aadd6aef0dc4c56317621" "checksum parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1b97670a2ffadce7c397fb80a3d687c4f3060140b885621ef1653d0e5d5068" +"checksum pdqsort 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afe9dd903f4f9ae691c768e649b00bac33d0487e0ca3edac94054a554b8a1588" "checksum phf 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "0c6afb2057bb5f846a7b75703f90bc1cef4970c35209f712925db7768e999202" "checksum phf_codegen 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "6b63f121bf9a128f2172a65d8313a8e0e79d63874eeb4b4b7d82e6dda6b62f7c" "checksum phf_generator 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "50ffbd7970f75afa083c5dd7b6830c97b72b81579c7a92d8134ef2ee6c0c7eb0" @@ -3586,7 +3582,6 @@ dependencies = [ "checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" "checksum quasi 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dcbf815446dc6a0afbc72d88f9a8aa71b608d10b168e09437c80c0fd6fd410c9" "checksum quasi_codegen 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b06172e92ab0099427609854ffb1512c377be5fc4beaf572ae5d5a01b8359596" -"checksum quickersort 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "14ae8f367c38c78abd03114e524b55a817885446662413fbca951f42848450c5" "checksum quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45" "checksum quote 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6732e32663c9c271bfc7c1823486b471f18c47a2dbf87c066897b7b51afc83be" "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 84011185af5..36f6aeadf4f 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -43,7 +43,7 @@ ordered-float = "0.2.2" owning_ref = "0.2.2" parking_lot = "0.3.3" phf = "0.7.20" -quickersort = "2.0.0" +pdqsort = "0.1.0" rayon = "0.6" rustc-serialize = "0.3" selectors = "0.15.1" diff --git a/components/style/lib.rs b/components/style/lib.rs index 0752b44172a..6954c0fe3e7 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -65,8 +65,8 @@ extern crate num_traits; extern crate ordered_float; extern crate owning_ref; extern crate parking_lot; +extern crate pdqsort; extern crate phf; -extern crate quickersort; extern crate rayon; extern crate rustc_serialize; extern crate selectors; diff --git a/components/style/stylist.rs b/components/style/stylist.rs index 4d8e3eb32f9..1f7c3cb913b 100644 --- a/components/style/stylist.rs +++ b/components/style/stylist.rs @@ -13,9 +13,9 @@ use error_reporting::StdoutErrorReporter; use keyframes::KeyframesAnimation; use media_queries::Device; use parking_lot::RwLock; +use pdqsort::sort_by; use properties::{self, CascadeFlags, ComputedValues, INHERIT_ALL, Importance}; use properties::{PropertyDeclaration, PropertyDeclarationBlock}; -use quickersort::sort_by; use restyle_hints::{RestyleHint, DependencySet}; use rule_tree::{RuleTree, StrongRuleNode, StyleSource}; use selector_parser::{ElementExt, SelectorImpl, PseudoElement, Snapshot}; @@ -827,7 +827,7 @@ pub struct SelectorMap { #[inline] fn sort_by_key<T, F: Fn(&T) -> K, K: Ord>(v: &mut [T], f: F) { - sort_by(v, &|a, b| f(a).cmp(&f(b))) + sort_by(v, |a, b| f(a).cmp(&f(b))) } impl SelectorMap { |