commit 94a75c9e53f7ae2721bd6cc7facffc178a8816e9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 17 17:32:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 17 17:32:54 2021 +0000
tree 33f2cece6b496f90ce8dcf1226a1d1c6b14a50f1
parent 4e04f9df20b0fd3c30451d3c8848526192cd149e
parent da70d9c4f2deed3bee6e266416b99cc0c0988a07

Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/parking_lot_core"

.cargo_vcs_info.json

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"
   }
 }

Android.bp

diff --git a/Android.bp b/Android.bp
index 3c6ca0b..dee3192 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,6 +70,9 @@
 rust_test_host {
     name: "parking_lot_core_host_test_src_lib",
     defaults: ["parking_lot_core_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -80,5 +83,5 @@
 // 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

Cargo.toml

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 @@
 optional = true
 
 [dependencies.smallvec]
-version = "1.0"
+version = "1.6.1"
 
 [dependencies.thread-id]
 version = "3.3.0"
@@ -45,7 +45,7 @@
 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]

Cargo.toml.orig

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 @@
 
 [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 @@
 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",

METADATA

diff --git a/METADATA b/METADATA
index 3590e6a..a3eea08 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   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
   }
 }

TEST_MAPPING

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": [
     {