Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid parking_lot bustage with recent rustc nightlies. #26646

Merged
merged 1 commit into from May 26, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Remove use of nightly features in parking_lot. Update many uses from …

…0.9 to 0.10.
  • Loading branch information
jdm committed May 26, 2020
commit 1da40b59af3b4f4b10dd5c04bc786ba577c2fa58

Some generated files are not rendered by default. Learn more.

@@ -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"
@@ -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"
@@ -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"
@@ -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" }
@@ -17,7 +17,7 @@ lazy_static = "1"
ipc-channel = "0.14"
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"}
@@ -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" }
@@ -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"}
@@ -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" }
@@ -35,7 +35,6 @@ packages = [
"peek-poke",
"peek-poke-derive",
"wayland-sys",
"metal",
"parking_lot",
"parking_lot_core",
"ron",
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.