Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24129 - Eijebong:parking_lot, r=jdm

Browse source 
Deduplicate parking_lot by updating it to 0.9

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24129)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-09-05 15:50:29 -04:00 • committed by GitHub
commit 524e135573
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 155 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

329
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
components/background_hang_monitor/sampler.rs
View file

@ -30,7 +30,7 @@ impl Sampler for DummySampler {
// Several types in this file are currently not used in a Linux or Windows build. // Several types in this file are currently not used in a Linux or Windows build.
#[allow(dead_code)] #[allow(dead_code)]
pub type Address = *const libc::uint8_t; pub type Address = *const u8;
/// The registers used for stack unwinding /// The registers used for stack unwinding
#[allow(dead_code)] #[allow(dead_code)]

2
components/layout/Cargo.toml
View file

@ -34,7 +34,7 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"} net_traits = {path = "../net_traits"}
num-traits = "0.2" num-traits = "0.2"
ordered-float = "1.0" ordered-float = "1.0"
parking_lot = "0.8" parking_lot = "0.9"
profile_traits = {path = "../profile_traits"} profile_traits = {path = "../profile_traits"}
range = {path = "../range"} range = {path = "../range"}
rayon = "1" rayon = "1"

2
components/layout_thread/Cargo.toml
View file

@ -33,7 +33,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.8", features = ["nightly"]} parking_lot = { version = "0.9", features = ["nightly"] }
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

@ -33,7 +33,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.8", features = ["nightly"]} parking_lot = { version = "0.9", features = ["nightly"] }
profile_traits = {path = "../profile_traits"} profile_traits = {path = "../profile_traits"}
range = {path = "../range"} range = {path = "../range"}
rayon = "1" rayon = "1"

2
components/msg/Cargo.toml
View file

@ -17,7 +17,7 @@ lazy_static = "1"
ipc-channel = "0.12" ipc-channel = "0.12"
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.8" parking_lot = "0.9"
serde = "1.0.60" serde = "1.0.60"
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

2
components/script/Cargo.toml
View file

@ -78,7 +78,7 @@ mime_guess = "2.0.0-alpha.6"
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.8" parking_lot = "0.9"
percent-encoding = "2.0" percent-encoding = "2.0"
phf = "0.7" phf = "0.7"
pixels = {path = "../pixels"} pixels = {path = "../pixels"}

2
components/style/Cargo.toml
View file

@ -56,7 +56,7 @@ num-traits = "0.2"
num-derive = "0.2" num-derive = "0.2"
ordered-float = "1.0" ordered-float = "1.0"
owning_ref = "0.4" owning_ref = "0.4"
parking_lot = "0.8" parking_lot = "0.9"
precomputed-hash = "0.1.1" precomputed-hash = "0.1.1"
rayon = "1" rayon = "1"
selectors = { path = "../selectors" } selectors = { path = "../selectors" }

4
ports/libsimpleservo/api/src/gl_glue.rs
View file

@ -15,9 +15,9 @@ pub mod egl {
pub type EGLNativeWindowType = *const libc::c_void; pub type EGLNativeWindowType = *const libc::c_void;
pub type khronos_utime_nanoseconds_t = khronos_uint64_t; 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 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 EGLContext = *const libc::c_void;
pub type EGLNativeDisplayType = *const libc::c_void; pub type EGLNativeDisplayType = *const libc::c_void;
pub type EGLNativePixmapType = *const libc::c_void; pub type EGLNativePixmapType = *const libc::c_void;

4
servo-tidy.toml
View file

@ -35,14 +35,10 @@ rand = [
# Ignored packages with duplicated versions # Ignored packages with duplicated versions
packages = [ packages = [
"gl_generator", # https://github.com/servo/servo/pull/23288#issuecomment-494687746 "gl_generator", # https://github.com/servo/servo/pull/23288#issuecomment-494687746
"lock_api",
"nix", # https://github.com/servo/servo/issues/23189#issuecomment-487512605 "nix", # https://github.com/servo/servo/issues/23189#issuecomment-487512605
"parking_lot",
"parking_lot_core",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rand_core", "rand_core",
"scopeguard",
"syn", "syn",
"unicode-xid", "unicode-xid",
] ]