diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-02-06 03:45:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-06 03:45:47 +0000 |
commit | f40dabe67b7bbd12e6a8241f521f6ca0e8a2f68d (patch) | |
tree | ec7e33ca6de7ca6c71804e29493e7027acae7f75 | |
parent | 0423f76223f41a792b9eeb3a96b9195f236dd4db (diff) | |
parent | 04abdc9af4204cafb1886f095df0d9b21431b8aa (diff) | |
download | parking_lot_core-f40dabe67b7bbd12e6a8241f521f6ca0e8a2f68d.tar.gz |
Upgrade parking_lot_core to 0.9.7 am: 96d8aa59e3 am: efb738516f am: 04abdc9af4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/2419307
Change-Id: I3ec3727fa6904fbcc9cb3d2e7381e6665f7c4004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | src/thread_parker/unix.rs | 8 |
6 files changed, 17 insertions, 15 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 1fb3332..bba71f7 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "df69aa6f99d1b5216f14340add0f2b3dcd5c296b" + "sha1": "f549eacc36168db632f63731c701ac0521b58e50" }, "path_in_vcs": "core" }
\ No newline at end of file @@ -45,7 +45,7 @@ rust_library { host_supported: true, crate_name: "parking_lot_core", cargo_env_compat: true, - cargo_pkg_version: "0.9.5", + cargo_pkg_version: "0.9.7", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -67,7 +67,7 @@ rust_test { host_supported: true, crate_name: "parking_lot_core", cargo_env_compat: true, - cargo_pkg_version: "0.9.5", + cargo_pkg_version: "0.9.7", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -12,7 +12,7 @@ [package] edition = "2018" name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" authors = ["Amanieu d'Antras <amanieu@gmail.com>"] description = "An advanced API for creating custom synchronization primitives." keywords = [ @@ -59,7 +59,7 @@ version = "0.2.8" version = "0.2.95" [target."cfg(windows)".dependencies.windows-sys] -version = "0.42.0" +version = "0.45.0" features = [ "Win32_Foundation", "Win32_System_LibraryLoader", diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 41adfdf..c1fd530 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" authors = ["Amanieu d'Antras <amanieu@gmail.com>"] description = "An advanced API for creating custom synchronization primitives." license = "MIT OR Apache-2.0" @@ -23,7 +23,7 @@ libc = "0.2.95" redox_syscall = "0.2.8" [target.'cfg(windows)'.dependencies] -windows-sys = { version = "0.42.0", features = [ +windows-sys = { version = "0.45.0", features = [ "Win32_Foundation", "Win32_System_LibraryLoader", "Win32_System_SystemServices", @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.5.crate" + value: "https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.9.7.crate" } - version: "0.9.5" + version: "0.9.7" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 12 - day: 13 + year: 2023 + month: 2 + day: 3 } } diff --git a/src/thread_parker/unix.rs b/src/thread_parker/unix.rs index 88b6df8..7f28603 100644 --- a/src/thread_parker/unix.rs +++ b/src/thread_parker/unix.rs @@ -5,7 +5,7 @@ // http://opensource.org/licenses/MIT>, at your option. This file may not be // copied, modified, or distributed except according to those terms. -#[cfg(any(target_os = "macos", target_os = "ios"))] +#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))] use core::ptr; use core::{ cell::{Cell, UnsafeCell}, @@ -130,6 +130,7 @@ impl ThreadParker { #[cfg(any( target_os = "macos", target_os = "ios", + target_os = "watchos", target_os = "android", target_os = "espidf" ))] @@ -140,6 +141,7 @@ impl ThreadParker { #[cfg(not(any( target_os = "macos", target_os = "ios", + target_os = "watchos", target_os = "android", target_os = "espidf" )))] @@ -193,7 +195,7 @@ impl super::UnparkHandleT for UnparkHandle { } // Returns the current time on the clock used by pthread_cond_t as a timespec. -#[cfg(any(target_os = "macos", target_os = "ios"))] +#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))] #[inline] fn timespec_now() -> libc::timespec { let mut now = MaybeUninit::<libc::timeval>::uninit(); @@ -206,7 +208,7 @@ fn timespec_now() -> libc::timespec { tv_nsec: now.tv_usec as tv_nsec_t * 1000, } } -#[cfg(not(any(target_os = "macos", target_os = "ios")))] +#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "watchos")))] #[inline] fn timespec_now() -> libc::timespec { let mut now = MaybeUninit::<libc::timespec>::uninit(); |