Add owning_ref back as a style dep, and update parking_lot.

servo · bors-servo · Jul 13, 2017 · Jul 11, 2017 · May 26, 2017 · Jul 11, 2017
commit d1c31f7eafed2708354423852642c3dd8efe077a
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"}