Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove use of nightly features in parking_lot. Update many uses from 0.9 to 0.10.

Browse source
This commit is contained in:
Josh Matthews 2020-05-25 19:40:50 -04:00
parent 95a818e262
commit 1da40b59af
10 changed files with 20 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Cargo.lock generated
View file

@ -1885,7 +1885,7 @@ dependencies = [
"gfx-hal", "gfx-hal",
"lazy_static", "lazy_static",
"log", "log",
"metal 0.18.0", "metal",
"objc", "objc",
"parking_lot 0.10.2", "parking_lot 0.10.2",
"range-alloc", "range-alloc",
@ -2864,7 +2864,7 @@ dependencies = [
"msg", "msg",
"net_traits", "net_traits",
"num-traits", "num-traits",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"profile_traits", "profile_traits",
"range", "range",
"rayon", "rayon",
@ -2908,7 +2908,7 @@ dependencies = [
"mitochondria", "mitochondria",
"msg", "msg",
"net_traits", "net_traits",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"range", "range",
"rayon", "rayon",
"rayon_croissant", "rayon_croissant",
@ -2950,7 +2950,7 @@ dependencies = [
"metrics", "metrics",
"msg", "msg",
"net_traits", "net_traits",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"profile_traits", "profile_traits",
"range", "range",
"rayon", "rayon",
@ -2995,7 +2995,7 @@ dependencies = [
"metrics", "metrics",
"msg", "msg",
"net_traits", "net_traits",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"profile_traits", "profile_traits",
"range", "range",
"script", "script",
@ -3401,21 +3401,6 @@ dependencies = [
"rustc_version", "rustc_version",
] ]
[[package]]
name = "metal"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83c7dcc2038e12f68493fa3de44235df27b2497178e257185b4b5b5d028a1e4"
dependencies = [
"bitflags",
"block",
"cocoa 0.19.1",
"core-graphics 0.17.3",
"foreign-types",
"log",
"objc",
]
[[package]] [[package]]
name = "metal" name = "metal"
version = "0.18.0" version = "0.18.0"
@ -3614,7 +3599,7 @@ dependencies = [
"lazy_static", "lazy_static",
"malloc_size_of", "malloc_size_of",
"malloc_size_of_derive", "malloc_size_of_derive",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"serde", "serde",
"servo_url", "servo_url",
"size_of_test", "size_of_test",
@ -4691,7 +4676,7 @@ dependencies = [
"msg", "msg",
"net_traits", "net_traits",
"num-traits", "num-traits",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"percent-encoding", "percent-encoding",
"phf", "phf",
"phf_codegen", "phf_codegen",
@ -4755,7 +4740,7 @@ dependencies = [
"metrics", "metrics",
"msg", "msg",
"net_traits", "net_traits",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"profile_traits", "profile_traits",
"range", "range",
"script_traits", "script_traits",
@ -5583,7 +5568,7 @@ dependencies = [
"num-traits", "num-traits",
"num_cpus", "num_cpus",
"owning_ref", "owning_ref",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"precomputed-hash", "precomputed-hash",
"rayon", "rayon",
"regex", "regex",
@ -5667,7 +5652,7 @@ dependencies = [
[[package]] [[package]]
name = "surfman" name = "surfman"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/servo/surfman#bc084411664b04dba777659e5ce16b5f95b7371a" source = "git+https://github.com/servo/surfman#2283acaa3a856c2f76028cb23b5dde7dc0030cdf"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cfg_aliases", "cfg_aliases",
@ -5683,9 +5668,9 @@ dependencies = [
"libc", "libc",
"log", "log",
"mach", "mach",
"metal 0.17.1", "metal",
"objc", "objc",
"parking_lot 0.9.0", "parking_lot 0.10.2",
"wayland-sys 0.24.0", "wayland-sys 0.24.0",
"winapi", "winapi",
"winit", "winit",

2
components/layout/Cargo.toml
View file

@ -33,7 +33,7 @@ malloc_size_of = { path = "../malloc_size_of" }
msg = { path = "../msg" } msg = { path = "../msg" }
net_traits = { path = "../net_traits" } net_traits = { path = "../net_traits" }
num-traits = "0.2" num-traits = "0.2"
parking_lot = "0.9" parking_lot = "0.10"
profile_traits = { path = "../profile_traits" } profile_traits = { path = "../profile_traits" }
range = { path = "../range" } range = { path = "../range" }
rayon = "1" rayon = "1"

2
components/layout_2020/Cargo.toml
View file

@ -30,7 +30,7 @@ log = "0.4"
mitochondria = "1.1.2" mitochondria = "1.1.2"
msg = { path = "../msg" } msg = { path = "../msg" }
net_traits = { path = "../net_traits" } net_traits = { path = "../net_traits" }
parking_lot = "0.9" parking_lot = "0.10"
range = { path = "../range" } range = { path = "../range" }
rayon = "1" rayon = "1"
rayon_croissant = "0.2.0" rayon_croissant = "0.2.0"

2
components/layout_thread/Cargo.toml
View file

@ -32,7 +32,7 @@ malloc_size_of = { path = "../malloc_size_of" }
metrics = { path = "../metrics" } metrics = { path = "../metrics" }
msg = { path = "../msg" } msg = { path = "../msg" }
net_traits = { path = "../net_traits" } net_traits = { path = "../net_traits" }
parking_lot = { version = "0.9", features = ["nightly"] } parking_lot = { version = "0.10" }
profile_traits = { path = "../profile_traits" } profile_traits = { path = "../profile_traits" }
range = { path = "../range" } range = { path = "../range" }
rayon = "1" rayon = "1"

2
components/layout_thread_2020/Cargo.toml
View file

@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" }
metrics = { path = "../metrics" } metrics = { path = "../metrics" }
msg = { path = "../msg" } msg = { path = "../msg" }
net_traits = { path = "../net_traits" } net_traits = { path = "../net_traits" }
parking_lot = { version = "0.9", features = ["nightly"] } parking_lot = { version = "0.10" }
profile_traits = { path = "../profile_traits" } profile_traits = { path = "../profile_traits" }
range = { path = "../range" } range = { path = "../range" }
script = { path = "../script" } script = { path = "../script" }

2
components/msg/Cargo.toml
View file

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

2
components/script/Cargo.toml
View file

@ -79,7 +79,7 @@ mitochondria = "1.1.2"
msg = { path = "../msg" } msg = { path = "../msg" }
net_traits = { path = "../net_traits" } net_traits = { path = "../net_traits" }
num-traits = "0.2" num-traits = "0.2"
parking_lot = "0.9" parking_lot = "0.10"
percent-encoding = "2.0" percent-encoding = "2.0"
phf = "0.8" phf = "0.8"
pixels = { path = "../pixels" } pixels = { path = "../pixels" }

2
components/script_layout_interface/Cargo.toml
View file

@ -26,7 +26,7 @@ malloc_size_of_derive = "0.1"
metrics = {path = "../metrics"} metrics = {path = "../metrics"}
msg = {path = "../msg"} msg = {path = "../msg"}
net_traits = {path = "../net_traits"} net_traits = {path = "../net_traits"}
parking_lot = "0.9" parking_lot = "0.10"
profile_traits = {path = "../profile_traits"} profile_traits = {path = "../profile_traits"}
range = {path = "../range"} range = {path = "../range"}
script_traits = {path = "../script_traits"} script_traits = {path = "../script_traits"}

2
components/style/Cargo.toml
View file

@ -54,7 +54,7 @@ num-integer = "0.1"
num-traits = "0.2" num-traits = "0.2"
num-derive = "0.3" num-derive = "0.3"
owning_ref = "0.4" owning_ref = "0.4"
parking_lot = "0.9" parking_lot = "0.10"
precomputed-hash = "0.1.1" precomputed-hash = "0.1.1"
rayon = "1" rayon = "1"
selectors = { path = "../selectors" } selectors = { path = "../selectors" }

1
servo-tidy.toml
View file

@ -35,7 +35,6 @@ packages = [
"peek-poke", "peek-poke",
"peek-poke-derive", "peek-poke-derive",
"wayland-sys", "wayland-sys",
"metal",
"parking_lot", "parking_lot",
"parking_lot_core", "parking_lot_core",
"ron", "ron",