summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2021-02-17 17:34:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 17:34:07 +0000
commit11971c000c91a4ab599a5d9814cf9292a2df06c2 (patch)
tree68d085f8a8f50377ebe874045cb0a756ff0de107
parent9b08926440721613e6d5f8afd5349bf6dcc86144 (diff)
parent4e04f9df20b0fd3c30451d3c8848526192cd149e (diff)
downloadparking_lot_core-11971c000c91a4ab599a5d9814cf9292a2df06c2.tar.gz
Upgrade rust/crates/parking_lot_core to 0.8.3 am: 4e04f9df20
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/1587607 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57c0191ae3e3e7e7d4e9e9ab62c3fdd4c1a0679b
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp7
-rw-r--r--Cargo.toml6
-rw-r--r--Cargo.toml.orig6
-rw-r--r--METADATA10
-rw-r--r--TEST_MAPPING2
6 files changed, 18 insertions, 15 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index d08ddd4..b278af6 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "dac08482fec1297c15e67c2fe034a1a5c463915d"
+ "sha1": "f3ea9e2082735525e84b30acd39c3f1d9d845c9a"
}
}
diff --git a/Android.bp b/Android.bp
index fed362f..cde1f55 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,9 @@ rust_defaults {
rust_test_host {
name: "parking_lot_core_host_test_src_lib",
defaults: ["parking_lot_core_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
@@ -42,5 +45,5 @@ rust_test {
// dependent_library ["feature_list"]
// cfg-if-1.0.0
// instant-0.1.9
-// libc-0.2.81 "default,std"
-// smallvec-1.5.1
+// libc-0.2.86 "default,std"
+// smallvec-1.6.1
diff --git a/Cargo.toml b/Cargo.toml
index c24c1de..a9184c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.3"
authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
description = "An advanced API for creating custom synchronization primitives."
keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
@@ -35,7 +35,7 @@ version = "0.5.1"
optional = true
[dependencies.smallvec]
-version = "1.0"
+version = "1.6.1"
[dependencies.thread-id]
version = "3.3.0"
@@ -45,7 +45,7 @@ optional = true
deadlock_detection = ["petgraph", "thread-id", "backtrace"]
nightly = []
[target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
-version = "0.1.56"
+version = "0.2.4"
[target."cfg(unix)".dependencies.libc]
version = "0.2.71"
[target."cfg(windows)".dependencies.winapi]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index db7830e..e4af2fc 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.3"
authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
description = "An advanced API for creating custom synchronization primitives."
license = "Apache-2.0/MIT"
@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
cfg-if = "1.0.0"
-smallvec = "1.0"
+smallvec = "1.6.1"
petgraph = { version = "0.5.1", optional = true }
thread-id = { version = "3.3.0", optional = true }
backtrace = { version = "0.3.49", optional = true }
@@ -21,7 +21,7 @@ instant = "0.1.4"
libc = "0.2.71"
[target.'cfg(target_os = "redox")'.dependencies]
-redox_syscall = "0.1.56"
+redox_syscall = "0.2.4"
[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.8", features = ["winnt", "ntstatus", "minwindef",
diff --git a/METADATA b/METADATA
index 3590e6a..a3eea08 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.2.crate"
+ value: "https://static.crates.io/crates/parking_lot_core/parking_lot_core-0.8.3.crate"
}
- version: "0.8.2"
+ version: "0.8.3"
license_type: NOTICE
last_upgrade_date {
- year: 2020
- month: 12
- day: 22
+ year: 2021
+ month: 2
+ day: 12
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 33c9578..98e9fcf 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,4 +1,4 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
{
"presubmit": [
{