Snap for 8414339 from 0dd11c007840f993e3defdb32e8dde830543299f to tm-qpr1-release

Change-Id: Ibee5791684526ba526434fdb8b4cf4d97b6fc705
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index d146052..2d04484 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,6 @@
 {
   "git": {
-    "sha1": "c7dd271dcd92af17168746a809503ee392d6f6ad"
-  }
-}
+    "sha1": "672e9525bbc2e5682c380d36974f34716b963591"
+  },
+  "path_in_vcs": "impl"
+}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 6ef921c..d3c9ef4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,7 +43,7 @@
     name: "libthiserror_impl",
     crate_name: "thiserror_impl",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.0.29",
+    cargo_pkg_version: "1.0.30",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index 0a27665..97e0042 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,8 +11,9 @@
 
 [package]
 edition = "2018"
+rust-version = "1.31"
 name = "thiserror-impl"
-version = "1.0.29"
+version = "1.0.30"
 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 121f679..e2ad11b 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,8 +1,9 @@
 [package]
 name = "thiserror-impl"
-version = "1.0.29"
+version = "1.0.30"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
+rust-version = "1.31"
 license = "MIT OR Apache-2.0"
 description = "Implementation detail of the `thiserror` crate"
 repository = "https://github.com/dtolnay/thiserror"
diff --git a/METADATA b/METADATA
index 59c63eb..594ab80 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.29.crate"
+    value: "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.30.crate"
   }
-  version: "1.0.29"
+  version: "1.0.30"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2021
-    month: 9
-    day: 22
+    year: 2022
+    month: 3
+    day: 1
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ec89789..eea7991 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -22,6 +22,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "diced_open_dice_cbor_test"
+    },
+    {
+      "name": "diced_sample_inputs_test"
+    },
+    {
+      "name": "diced_test"
+    },
+    {
+      "name": "diced_utils_test"
+    },
+    {
+      "name": "diced_vendor_test"
+    },
+    {
       "name": "doh_unit_test"
     },
     {
@@ -52,10 +67,13 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "libcert_request_validator_tests"
     },
     {
-      "name": "open_then_run_module"
+      "name": "librustutils_test"
+    },
+    {
+      "name": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"
@@ -72,6 +90,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "diced_open_dice_cbor_test"
+    },
+    {
+      "name": "diced_sample_inputs_test"
+    },
+    {
+      "name": "diced_test"
+    },
+    {
+      "name": "diced_utils_test"
+    },
+    {
+      "name": "diced_vendor_test"
+    },
+    {
       "name": "doh_unit_test"
     },
     {
@@ -102,10 +135,13 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "libcert_request_validator_tests"
     },
     {
-      "name": "open_then_run_module"
+      "name": "librustutils_test"
+    },
+    {
+      "name": "microdroid_manager_test"
     },
     {
       "name": "virtualizationservice_device_test"