Skip to content
Permalink
Browse files

Deduplicate parking_lot and friends by updating it to 0.9

  • Loading branch information...
Eijebong committed Sep 3, 2019
1 parent 4f4e219 commit b6cddbebaa1b0f664cbd493c236ad2734f3b8d67

Large diffs are not rendered by default.

@@ -30,7 +30,7 @@ impl Sampler for DummySampler {

// Several types in this file are currently not used in a Linux or Windows build.
#[allow(dead_code)]
pub type Address = *const libc::uint8_t;
pub type Address = *const u8;

/// The registers used for stack unwinding
#[allow(dead_code)]
@@ -34,7 +34,7 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.2"
ordered-float = "1.0"
parking_lot = "0.8"
parking_lot = "0.9"
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
rayon = "1"
@@ -33,7 +33,7 @@ malloc_size_of = { path = "../malloc_size_of" }
metrics = {path = "../metrics"}
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
parking_lot = {version = "0.8", features = ["nightly"]}
parking_lot = { version = "0.9", features = ["nightly"] }
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
rayon = "1"
@@ -33,7 +33,7 @@ malloc_size_of = { path = "../malloc_size_of" }
metrics = {path = "../metrics"}
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
parking_lot = {version = "0.8", features = ["nightly"]}
parking_lot = { version = "0.9", features = ["nightly"] }
profile_traits = {path = "../profile_traits"}
range = {path = "../range"}
rayon = "1"
@@ -17,7 +17,7 @@ lazy_static = "1"
ipc-channel = "0.12"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
parking_lot = "0.8"
parking_lot = "0.9"
serde = "1.0.60"
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

@@ -78,7 +78,7 @@ mime_guess = "2.0.0-alpha.6"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.2"
parking_lot = "0.8"
parking_lot = "0.9"
percent-encoding = "2.0"
phf = "0.7"
pixels = {path = "../pixels"}
@@ -56,7 +56,7 @@ num-traits = "0.2"
num-derive = "0.2"
ordered-float = "1.0"
owning_ref = "0.4"
parking_lot = "0.8"
parking_lot = "0.9"
precomputed-hash = "0.1.1"
rayon = "1"
selectors = { path = "../selectors" }
@@ -15,9 +15,9 @@ pub mod egl {

pub type EGLNativeWindowType = *const libc::c_void;
pub type khronos_utime_nanoseconds_t = khronos_uint64_t;
pub type khronos_uint64_t = libc::uint64_t;
pub type khronos_uint64_t = u64;
pub type khronos_ssize_t = libc::c_long;
pub type EGLint = libc::int32_t;
pub type EGLint = i32;
pub type EGLContext = *const libc::c_void;
pub type EGLNativeDisplayType = *const libc::c_void;
pub type EGLNativePixmapType = *const libc::c_void;
@@ -35,14 +35,10 @@ rand = [
# Ignored packages with duplicated versions
packages = [
"gl_generator", # https://github.com/servo/servo/pull/23288#issuecomment-494687746
"lock_api",
"nix", # https://github.com/servo/servo/issues/23189#issuecomment-487512605
"parking_lot",
"parking_lot_core",
"proc-macro2",
"quote",
"rand_core",
"scopeguard",
"syn",
"unicode-xid",
]

0 comments on commit b6cddbe

Please sign in to comment.
You can’t perform that action at this time.