Auto merge of #26646 - jdm:parking_lot, r=asajeffrey

Avoid parking_lot bustage with recent rustc nightlies. - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #26644 - [x] There are tests for these changes
servo · May 26, 2020 · f331373 · f331373
2 parents 70c43b7 + 1da40b5
commit f331373
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -33,7 +33,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
 num-traits = "0.2"
-parking_lot = "0.9"
+parking_lot = "0.10"
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 rayon = "1"

diff --git a/components/layout_2020/Cargo.toml b/components/layout_2020/Cargo.toml
@@ -30,7 +30,7 @@ log = "0.4"
 mitochondria = "1.1.2"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = "0.9"
+parking_lot = "0.10"
 range = { path = "../range" }
 rayon = "1"
 rayon_croissant = "0.2.0"

diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
@@ -32,7 +32,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 metrics = { path = "../metrics" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = { version = "0.9", features = ["nightly"] }
+parking_lot = { version = "0.10" }
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 rayon = "1"

diff --git a/components/layout_thread_2020/Cargo.toml b/components/layout_thread_2020/Cargo.toml
@@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 metrics = { path = "../metrics" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = { version = "0.9", features = ["nightly"] }
+parking_lot = { version = "0.10" }
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 script = { path = "../script" }

diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
@@ -17,7 +17,7 @@ ipc-channel = "0.14"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-parking_lot = "0.9"
+parking_lot = "0.10"
 serde = "1.0.60"
 servo_url = { path = "../url" }
 webrender_api = { git = "https://github.com/servo/webrender" }

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -79,7 +79,7 @@ mitochondria = "1.1.2"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
 num-traits = "0.2"
-parking_lot = "0.9"
+parking_lot = "0.10"
 percent-encoding = "2.0"
 phf = "0.8"
 pixels = { path = "../pixels" }

diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
@@ -26,7 +26,7 @@ malloc_size_of_derive = "0.1"
 metrics = {path = "../metrics"}
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-parking_lot = "0.9"
+parking_lot = "0.10"
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 script_traits = {path = "../script_traits"}

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -54,7 +54,7 @@ num-integer = "0.1"
 num-traits = "0.2"
 num-derive = "0.3"
 owning_ref = "0.4"
-parking_lot = "0.9"
+parking_lot = "0.10"
 precomputed-hash = "0.1.1"
 rayon = "1"
 selectors = { path = "../selectors" }

diff --git a/servo-tidy.toml b/servo-tidy.toml
@@ -35,7 +35,6 @@ packages = [
   "peek-poke",
   "peek-poke-derive",
   "wayland-sys",
-  "metal",
   "parking_lot",
   "parking_lot_core",
   "ron",