Upgrade rust/crates/env_logger to 0.8.2 am: 60aab5f851

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1503432

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68fc35b25df45d3808f2967377de3bb4e2ef0421

8 files changed, 34 insertions, 37 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 35d1636..7e09207 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "26e821b94f0b0b9fd3536c0ba7095c1b6c7a3ffe"
+    "sha1": "0f53c8dd5bf65b80d1fdb8ea0befd848f120c631"
   }
 }
diff --git a/Android.bp b/Android.bp
index 066701b..a1abfe9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,9 @@ rust_defaults {
 rust_test_host {
     name: "env_logger_host_test_src_lib",
     defaults: ["env_logger_defaults"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -41,6 +44,9 @@ rust_test_host {
     name: "env_logger_host_test_tests_init-twice-retains-filter",
     defaults: ["env_logger_defaults_env_logger"],
     srcs: ["tests/init-twice-retains-filter.rs"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -53,6 +59,9 @@ rust_test_host {
     name: "env_logger_host_test_tests_log-in-log",
     defaults: ["env_logger_defaults_env_logger"],
     srcs: ["tests/log-in-log.rs"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -65,6 +74,9 @@ rust_test_host {
     name: "env_logger_host_test_tests_log_tls_dtors",
     defaults: ["env_logger_defaults_env_logger"],
     srcs: ["tests/log_tls_dtors.rs"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -77,6 +89,9 @@ rust_test_host {
     name: "env_logger_host_test_tests_regexp_filter",
     defaults: ["env_logger_defaults_env_logger"],
     srcs: ["tests/regexp_filter.rs"],
+    test_options: {
+        unit_test: true,
+    },
 }
 
 rust_test {
@@ -98,4 +113,4 @@ rust_library {
 
 // dependent_library ["feature_list"]
 //   cfg-if-0.1.10
-//   log-0.4.11 "std"
+//   log-0.4.13 "std"
diff --git a/Cargo.toml b/Cargo.toml
index d450a0b..f84ed82 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "env_logger"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["The Rust Project Developers"]
 description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"
 documentation = "https://docs.rs/env_logger"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 837c72b..449deaa 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
 [package]
 name = "env_logger"
 edition = "2018"
-version = "0.8.1" # remember to update html_root_url
+version = "0.8.2" # remember to update html_root_url
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
diff --git a/METADATA b/METADATA
index f988ce5..a22f130 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/env_logger/env_logger-0.8.1.crate"
+    value: "https://static.crates.io/crates/env_logger/env_logger-0.8.2.crate"
   }
-  version: "0.8.1"
+  version: "0.8.2"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
-    month: 10
-    day: 26
+    month: 11
+    day: 18
   }
 }
diff --git a/README.md b/README.md
index 1edd0e3..9f01ed4 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ It must be added along with `log` to the project dependencies:
 ```toml
 [dependencies]
 log = "0.4.0"
-env_logger = "0.8.1"
+env_logger = "0.8.2"
 ```
 
 `env_logger` must be initialized as early as possible in the project. After it's initialized, you can use the `log` macros to do actual logging.
@@ -59,7 +59,7 @@ Tests can use the `env_logger` crate to see log messages generated during that t
 log = "0.4.0"
 
 [dev-dependencies]
-env_logger = "0.8.1"
+env_logger = "0.8.2"
 ```
 
 ```rust
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 69ebf51..5ab713d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,50 +1,32 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by cargo2android.py for tests that depend on this crate.
 {
   "presubmit": [
     {
-      "host": true,
-      "name": "env_logger_host_test_src_lib"
-    },
-    {
-      "name": "env_logger_device_test_src_lib"
-    },
-    {
-      "host": true,
-      "name": "env_logger_host_test_tests_init-twice-retains-filter"
-    },
-    {
       "name": "env_logger_device_test_tests_init-twice-retains-filter"
     },
     {
-      "host": true,
-      "name": "env_logger_host_test_tests_log-in-log"
-    },
-    {
       "name": "env_logger_device_test_tests_log-in-log"
     },
     {
-      "host": true,
-      "name": "env_logger_host_test_tests_log_tls_dtors"
+      "name": "env_logger_device_test_tests_regexp_filter"
     },
     {
-      "name": "env_logger_device_test_tests_log_tls_dtors"
+      "name": "android_logger_device_test_src_lib"
     },
     {
-      "host": true,
-      "name": "env_logger_host_test_tests_regexp_filter"
+      "name": "keystore2_selinux_test"
     },
     {
-      "name": "env_logger_device_test_tests_regexp_filter"
+      "name": "env_logger_device_test_tests_log_tls_dtors"
     },
     {
-      "name": "android_logger_device_test_src_lib"
+      "name": "keystore2_test"
     },
     {
-      "host": true,
-      "name": "libsqlite3-sys_host_test_src_lib"
+      "name": "libsqlite3-sys_device_test_src_lib"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "env_logger_device_test_src_lib"
     }
   ]
 }
diff --git a/src/lib.rs b/src/lib.rs
index 4fa4055..36f30c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -232,7 +232,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/static/images/favicon.ico",
-    html_root_url = "https://docs.rs/env_logger/0.8.1"
+    html_root_url = "https://docs.rs/env_logger/0.8.2"
 )]
 #![cfg_attr(test, deny(warnings))]
 // When compiled for the rustc compiler itself we want to make sure that this is