From d1c31f7eafed2708354423852642c3dd8efe077a Mon Sep 17 00:00:00 2001 From: Bobby Holley Date: Tue, 11 Jul 2017 15:56:15 -0700 Subject: [PATCH] Add owning_ref back as a style dep, and update parking_lot. --- Cargo.lock | 33 +++++++++++++++++++---------- components/layout/Cargo.toml | 2 +- components/layout_thread/Cargo.toml | 2 +- components/script/Cargo.toml | 2 +- components/servo_arc/Cargo.toml | 3 ++- components/servo_arc/lib.rs | 3 ++- components/style/Cargo.toml | 3 ++- components/style/lib.rs | 1 + ports/geckolib/Cargo.toml | 2 +- tests/unit/style/Cargo.toml | 2 +- 10 files changed, 34 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1e05813c9f..f125ab61e87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1022,7 +1022,7 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "nsstring_vendor 0.1.0", - "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.19.0", "style 0.0.1", "style_traits 0.0.1", @@ -1451,7 +1451,7 @@ dependencies = [ "msg 0.0.1", "net_traits 0.0.1", "ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", "range 0.0.1", "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1497,7 +1497,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", - "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.0.1", @@ -2068,15 +2068,18 @@ dependencies = [ [[package]] name = "owning_ref" -version = "0.2.4" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "parking_lot" -version = "0.3.8" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "owning_ref 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "thread-id 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2450,7 +2453,7 @@ dependencies = [ "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2757,6 +2760,7 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "nodrop 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2908,6 +2912,11 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "stable_deref_trait" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "string_cache" version = "0.6.0" @@ -2974,7 +2983,8 @@ dependencies = [ "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "pdqsort 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3013,7 +3023,7 @@ dependencies = [ "cssparser 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.19.0", @@ -3746,8 +3756,8 @@ dependencies = [ "checksum ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da12c96037889ae0be29dd2bdd260e5a62a7df24e6466d5a15bb8131c1c200a8" "checksum osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)" = "" "checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" -"checksum owning_ref 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d52571ddcb42e9c900c901a18d8d67e393df723fcd51dd59c5b1a85d0acb6cc" -"checksum parking_lot 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fa12d706797d42551663426a45e2db2e0364bd1dbf6aeada87e89c5f981f43e9" +"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" +"checksum parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "37f364e2ce5efa24c7d0b6646d5bb61145551a0112f107ffd7499f1a3e322fbd" "checksum parking_lot_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ad2c4d148942b3560034785bf19df586ebba53351e8c78f84984147d5795eef" "checksum parse-hosts 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9aebf4a4f84ce5d940a30a919c93325a66ab4ddb646f5f0a3d77483eb99595a6" "checksum pdqsort 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ceca1642c89148ca05611cc775a0c383abef355fc4907c4e95f49f7b09d6287c" @@ -3805,6 +3815,7 @@ dependencies = [ "checksum skeptic 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd7d8dc1315094150052d0ab767840376335a98ac66ef313ff911cdf439a5b69" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" +"checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b" "checksum string_cache 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23429a3aca80e7cc7f0060853a97fbba9a90e30ef36b29d13e22559cd7f3dc54" "checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7" "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 16f82f2236f..63b48fdede5 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -26,7 +26,7 @@ log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} ordered-float = "0.4" -parking_lot = "0.3.3" +parking_lot = "0.4" profile_traits = {path = "../profile_traits"} range = {path = "../range"} rayon = "0.8" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index db9c92bb823..ebc9b33dfef 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -23,7 +23,7 @@ lazy_static = "0.2" log = "0.3.5" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -parking_lot = {version = "0.3.3", features = ["nightly"]} +parking_lot = {version = "0.4", features = ["nightly"]} profile_traits = {path = "../profile_traits"} rayon = "0.8" script = {path = "../script"} diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index c9ce38c1f35..56b2490f486 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -65,7 +65,7 @@ net_traits = {path = "../net_traits"} num-traits = "0.1.32" offscreen_gl_context = { version = "0.11", features = ["serde"] } open = "1.1.1" -parking_lot = "0.3" +parking_lot = "0.4" phf = "0.7.18" profile_traits = {path = "../profile_traits"} range = {path = "../range"} diff --git a/components/servo_arc/Cargo.toml b/components/servo_arc/Cargo.toml index 8f73bd61810..51e4dcccc16 100644 --- a/components/servo_arc/Cargo.toml +++ b/components/servo_arc/Cargo.toml @@ -14,5 +14,6 @@ servo = ["serde", "heapsize"] [dependencies] heapsize = {version = "0.4.0", optional = true} -serde = {version = "1.0", optional = true} nodrop = {version = "0.1.8"} +serde = {version = "1.0", optional = true} +stable_deref_trait = "1.0.0" diff --git a/components/servo_arc/lib.rs b/components/servo_arc/lib.rs index 0040fdea6d1..5dc261eefb6 100644 --- a/components/servo_arc/lib.rs +++ b/components/servo_arc/lib.rs @@ -22,8 +22,9 @@ // duplicate those here. #![allow(missing_docs)] -#[cfg(feature = "servo")] extern crate serde; extern crate nodrop; +#[cfg(feature = "servo")] extern crate serde; +extern crate stable_deref_trait; #[cfg(feature = "servo")] use heapsize::HeapSizeOf; diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index c6d23ab2b8c..860c652cd02 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -54,7 +54,8 @@ num_cpus = {version = "1.1.0", optional = true} num-integer = "0.1.32" num-traits = "0.1.32" ordered-float = "0.4" -parking_lot = "0.3.3" +owning_ref = "0.3.3" +parking_lot = "0.4" pdqsort = "0.1.0" precomputed-hash = "0.1" rayon = "0.8" diff --git a/components/style/lib.rs b/components/style/lib.rs index 5775dc1001b..3280caa5cb3 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -67,6 +67,7 @@ pub extern crate nsstring_vendor as nsstring; extern crate num_integer; extern crate num_traits; extern crate ordered_float; +extern crate owning_ref; extern crate parking_lot; extern crate pdqsort; #[cfg(feature = "gecko")] extern crate precomputed_hash; diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml index 5c50eb6bf7a..01c4012a4ae 100644 --- a/ports/geckolib/Cargo.toml +++ b/ports/geckolib/Cargo.toml @@ -21,7 +21,7 @@ env_logger = {version = "0.4", default-features = false} # disable `regex` to re libc = "0.2" log = {version = "0.3.5", features = ["release_max_level_info"]} nsstring_vendor = {path = "../../components/style/gecko_bindings/nsstring_vendor"} -parking_lot = "0.3" +parking_lot = "0.4" selectors = {path = "../../components/selectors"} style = {path = "../../components/style", features = ["gecko"]} style_traits = {path = "../../components/style_traits"} diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml index f5121de85a3..15acba42a02 100644 --- a/tests/unit/style/Cargo.toml +++ b/tests/unit/style/Cargo.toml @@ -18,7 +18,7 @@ app_units = "0.5" cssparser = "0.17.0" euclid = "0.15" html5ever = "0.18" -parking_lot = "0.3" +parking_lot = "0.4" rayon = "0.8" rustc-serialize = "0.3" selectors = {path = "../../../components/selectors"}