Merge "Upgrade rust/crates/serde_test to 1.0.130" am: bc6f98c6a3 am: 1482899541 am: 79efc7799e

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

Change-Id: I506f0ed056488f8e3d09bdbb8fd762a2ca2f4bc1

6 files changed, 13 insertions, 17 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 9c11542..d722bd8 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "e2f85681fea9229208e83ae873c3a9a077f4d255"
+    "sha1": "65e1a50749938612cfbdb69b57fc4cf249f87149"
   }
 }
diff --git a/Android.bp b/Android.bp
index d1fc0b3..34ad660 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --run --device --tests.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -42,6 +42,8 @@ rust_library {
     name: "libserde_test",
     host_supported: true,
     crate_name: "serde_test",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.130",
     srcs: ["src/lib.rs"],
     edition: "2015",
     rustlibs: [
@@ -53,6 +55,8 @@ rust_defaults {
     name: "serde_test_test_defaults",
     crate_name: "serde_test",
     srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.130",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -74,11 +78,3 @@ rust_test {
     name: "serde_test_device_test_src_lib",
     defaults: ["serde_test_test_defaults"],
 }
-
-// dependent_library ["feature_list"]
-//   proc-macro2-1.0.28 "default,proc-macro"
-//   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.127 "default,std"
-//   serde_derive-1.0.127 "default"
-//   syn-1.0.74 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-//   unicode-xid-0.2.2 "default"
diff --git a/Cargo.toml b/Cargo.toml
index 25ff86f..d92d6f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@
 
 [package]
 name = "serde_test"
-version = "1.0.127"
+version = "1.0.130"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 include = ["src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 description = "Token De/Serializer for testing De/Serialize implementations"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 44ab378..02d0a56 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "serde_test"
-version = "1.0.127" # remember to update html_root_url
+version = "1.0.130" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"
diff --git a/METADATA b/METADATA
index fc94051..fdb8eff 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/serde_test/serde_test-1.0.127.crate"
+    value: "https://static.crates.io/crates/serde_test/serde_test-1.0.130.crate"
   }
-  version: "1.0.127"
+  version: "1.0.130"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 8
-    day: 9
+    month: 9
+    day: 22
   }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 0b0acf4..a443026 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -144,7 +144,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.127")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.130")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints