Upgrade rust/crates/thiserror-impl to 1.0.25 am: 3c765a1c48

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1742523

Change-Id: I76458e241097ef8ecab2e813fa02e745787a1dfc

7 files changed, 28 insertions, 24 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 349cbda..bc886ab 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "1b0a84996b9492c0dc5779127a91c930f23a259e"
+    "sha1": "19cb5cee4b51203f6801daa3ff0185761d0d3d4c"
   }
 }
diff --git a/Android.bp b/Android.bp
index 11a5817..8e0a561 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,7 +52,7 @@ rust_proc_macro {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   proc-macro2-1.0.27 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   syn-1.0.60 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   unicode-xid-0.2.1 "default"
+//   syn-1.0.73 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   unicode-xid-0.2.2 "default"
diff --git a/Cargo.toml b/Cargo.toml
index a9b7471..44bc47f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.25"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Implementation detail of the `thiserror` crate"
 license = "MIT OR Apache-2.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 3963fe2..1458595 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.25"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
diff --git a/METADATA b/METADATA
index 2616031..d5fb4e5 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.24.crate"
+    value: "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.25.crate"
   }
-  version: "1.0.24"
+  version: "1.0.25"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 2
-    day: 18
+    month: 6
+    day: 21
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 743367a..254a499 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,52 +2,55 @@
 {
   "presubmit": [
     {
-      "name": "anyhow_device_test_tests_test_autotrait"
+      "name": "anyhow_device_test_src_lib"
     },
     {
-      "name": "keystore2_selinux_test"
+      "name": "anyhow_device_test_tests_test_autotrait"
     },
     {
-      "name": "anyhow_device_test_tests_test_repr"
+      "name": "anyhow_device_test_tests_test_boxed"
     },
     {
-      "name": "anyhow_device_test_tests_test_convert"
+      "name": "anyhow_device_test_tests_test_chain"
     },
     {
       "name": "anyhow_device_test_tests_test_context"
     },
     {
-      "name": "anyhow_device_test_tests_test_boxed"
+      "name": "anyhow_device_test_tests_test_convert"
     },
     {
       "name": "anyhow_device_test_tests_test_downcast"
     },
     {
-      "name": "keystore2_test"
+      "name": "anyhow_device_test_tests_test_ffi"
     },
     {
-      "name": "anyhow_device_test_tests_test_source"
+      "name": "anyhow_device_test_tests_test_fmt"
     },
     {
-      "name": "anyhow_device_test_src_lib"
+      "name": "anyhow_device_test_tests_test_macros"
     },
     {
-      "name": "anyhow_device_test_tests_test_fmt"
+      "name": "anyhow_device_test_tests_test_repr"
     },
     {
-      "name": "anyhow_device_test_tests_test_ffi"
+      "name": "anyhow_device_test_tests_test_source"
     },
     {
-      "name": "anyhow_device_test_tests_test_chain"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "keystore2_crypto_test_rust"
+      "name": "keystore2_selinux_test"
     },
     {
-      "name": "anyhow_device_test_tests_test_macros"
+      "name": "keystore2_test"
+    },
+    {
+      "name": "vpnprofilestore_test"
     }
   ]
 }
diff --git a/src/lib.rs b/src/lib.rs
index b0d4618..f0577d4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,7 @@
 #![allow(
     clippy::blocks_in_if_conditions,
     clippy::cast_possible_truncation,
+    clippy::manual_map,
     clippy::map_unwrap_or,
     clippy::needless_pass_by_value,
     clippy::option_if_let_else,