Snap for 8730993 from d80f655a to mainline-tzdata3-release

Change-Id: Ie9594cc31e10945a999572625dee42f5ba169acf

.cargo_vcs_info.json

 {
   "git": {
-    "sha1": "c6a6c72ac6f6a016ff283328d73f084e7d2e6a70"
+    "sha1": "d0aa541144151c09268878dd781f06011498389a"
   }
 }

Android.bp

-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --dependencies --device --tests.
 
 package {
     default_applicable_licenses: ["external_rust_crates_unicode-width_license"],
@@ -43,26 +42,32 @@ rust_library {
     // has rustc warnings
     host_supported: true,
     crate_name: "unicode_width",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.9",
     srcs: ["src/lib.rs"],
     edition: "2015",
-    features: ["default"],
+    features: [
+        "default",
+    ],
 }
 
-rust_test {
-    name: "unicode-width_test_src_lib",
-    // has rustc warnings
-    host_supported: true,
+rust_defaults {
+    name: "unicode-width_defaults",
     crate_name: "unicode_width",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.9",
+    // has rustc warnings
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
     edition: "2015",
-    features: ["default"],
+    features: [
+        "default",
+    ],
+}
+
+rust_test_host {
+    name: "unicode-width_host_test_src_lib",
+    defaults: ["unicode-width_defaults"],
+}
+
+rust_test {
+    name: "unicode-width_device_test_src_lib",
+    defaults: ["unicode-width_defaults"],
 }

Cargo.toml

@@ -3,15 +3,16 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies.
+# to registry (e.g., crates.io) dependencies
 #
-# If you are reading this file be aware that the original Cargo.toml
-# will likely look very different (and much more reasonable).
-# See Cargo.toml.orig for the original contents.
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
 
 [package]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.8"
 authors = ["kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"]
 exclude = ["target/*", "Cargo.lock"]
 description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n"

Cargo.toml.orig

 [package]
 
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.8"
 authors = ["kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"]
 
 homepage = "https://github.com/unicode-rs/unicode-width"

METADATA

@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/unicode-width/unicode-width-0.1.9.crate"
+    value: "https://static.crates.io/crates/unicode-width/unicode-width-0.1.8.crate"
   }
-  version: "0.1.9"
+  version: "0.1.8"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2021
+    year: 2020
     month: 9
-    day: 22
+    day: 9
   }
 }

TEST_MAPPING

-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests in Android.bp
 {
   "presubmit": [
     {
-      "name": "diced_test"
+      "name": "unicode-width_device_test_src_lib"
     },
     {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "unicode-width_test_src_lib"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "diced_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "keystore2_vintf_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "unicode-width_test_src_lib"
+      "name": "libsqlite3-sys_device_test_src_lib"
     }
   ]
 }

cargo2android.json

-{
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file