diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-12-13 17:02:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-13 17:02:27 +0000 |
commit | 1dee7597037a69d57b996d39ffa44040742fac89 (patch) | |
tree | 89096d7d2707265ee975a2710b3410b065f32801 /Cargo.toml | |
parent | dcb00d0ea2ad23dc2a82588ab68e528d9fdc6cef (diff) | |
parent | 4d06a26c36e38d464f74d64e9e52ac803990fa2b (diff) | |
download | parking_lot_core-1dee7597037a69d57b996d39ffa44040742fac89.tar.gz |
Merge "Upgrade parking_lot_core to 0.9.5" am: 51a13c47a0 am: 4d06a26c36
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/2345687
Change-Id: Ib8c8165debd8e192b508fef56d84cca12d0dcb0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'Cargo.toml')
-rw-r--r-- | Cargo.toml | 33 |
1 files changed, 26 insertions, 7 deletions
@@ -12,13 +12,20 @@ [package] edition = "2018" name = "parking_lot_core" -version = "0.9.1" +version = "0.9.5" authors = ["Amanieu d'Antras <amanieu@gmail.com>"] description = "An advanced API for creating custom synchronization primitives." -keywords = ["mutex", "condvar", "rwlock", "once", "thread"] +keywords = [ + "mutex", + "condvar", + "rwlock", + "once", + "thread", +] categories = ["concurrency"] -license = "Apache-2.0/MIT" +license = "MIT OR Apache-2.0" repository = "https://github.com/Amanieu/parking_lot" + [dependencies.backtrace] version = "0.3.60" optional = true @@ -27,7 +34,7 @@ optional = true version = "1.0.0" [dependencies.petgraph] -version = "0.5.1" +version = "0.6.0" optional = true [dependencies.smallvec] @@ -38,12 +45,24 @@ version = "4.0.0" optional = true [features] -deadlock_detection = ["petgraph", "thread-id", "backtrace"] +deadlock_detection = [ + "petgraph", + "thread-id", + "backtrace", +] nightly = [] + [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] version = "0.2.8" + [target."cfg(unix)".dependencies.libc] version = "0.2.95" + [target."cfg(windows)".dependencies.windows-sys] -version = "0.32" -features = ["Win32_Foundation", "Win32_System_LibraryLoader", "Win32_System_SystemServices", "Win32_System_WindowsProgramming"] +version = "0.42.0" +features = [ + "Win32_Foundation", + "Win32_System_LibraryLoader", + "Win32_System_SystemServices", + "Win32_System_WindowsProgramming", +] |