Upgrade rust/crates/serde_test to 1.0.127 am: 6147301884 am: 04b6ba3938

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

Change-Id: Ia6b51d9133361d0c6a5c1fab40ff355aa7688b97

7 files changed, 25 insertions, 26 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index d265e4c..9c11542 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "d9c338ec4abd1dd6fdd305e208bff1fd7faaabff"
+    "sha1": "e2f85681fea9229208e83ae873c3a9a077f4d255"
   }
 }
diff --git a/Android.bp b/Android.bp
index 8e7a36d..d1fc0b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,7 @@ rust_library {
 }
 
 rust_defaults {
-    name: "serde_test_defaults",
+    name: "serde_test_test_defaults",
     crate_name: "serde_test",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
@@ -64,7 +64,7 @@ rust_defaults {
 
 rust_test_host {
     name: "serde_test_host_test_src_lib",
-    defaults: ["serde_test_defaults"],
+    defaults: ["serde_test_test_defaults"],
     test_options: {
         unit_test: true,
     },
@@ -72,13 +72,13 @@ rust_test_host {
 
 rust_test {
     name: "serde_test_device_test_src_lib",
-    defaults: ["serde_test_defaults"],
+    defaults: ["serde_test_test_defaults"],
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.26 "default,proc-macro"
+//   proc-macro2-1.0.28 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
-//   serde-1.0.126 "default,std"
-//   serde_derive-1.0.126 "default"
-//   syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   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 76abdae..25ff86f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,16 +3,15 @@
 # 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 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)
+# 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.
 
 [package]
 name = "serde_test"
-version = "1.0.126"
+version = "1.0.127"
 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 0237d18..44ab378 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "serde_test"
-version = "1.0.126" # remember to update html_root_url
+version = "1.0.127" # 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 afcb054..fc94051 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.126.crate"
+    value: "https://static.crates.io/crates/serde_test/serde_test-1.0.127.crate"
   }
-  version: "1.0.126"
+  version: "1.0.127"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 5
-    day: 19
+    month: 8
+    day: 9
   }
 }
diff --git a/src/lib.rs b/src/lib.rs
index c29d317..0b0acf4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -144,7 +144,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.126")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.127")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints
diff --git a/src/ser.rs b/src/ser.rs
index a980a04..0827e79 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -32,18 +32,18 @@ impl<'a> Serializer<'a> {
 }
 
 macro_rules! assert_next_token {
-    ($ser:expr, $actual:ident) => {
+    ($ser:expr, $actual:ident) => {{
         assert_next_token!($ser, stringify!($actual), Token::$actual, true);
-    };
-    ($ser:expr, $actual:ident($v:expr)) => {
+    }};
+    ($ser:expr, $actual:ident($v:expr)) => {{
         assert_next_token!(
             $ser,
             format_args!(concat!(stringify!($actual), "({:?})"), $v),
             Token::$actual(v),
             v == $v
         );
-    };
-    ($ser:expr, $actual:ident { $($k:ident),* }) => {
+    }};
+    ($ser:expr, $actual:ident { $($k:ident),* }) => {{
         let compare = ($($k,)*);
         let field_format = || {
             use std::fmt::Write;
@@ -59,7 +59,7 @@ macro_rules! assert_next_token {
             Token::$actual { $($k),* },
             ($($k,)*) == compare
         );
-    };
+    }};
     ($ser:expr, $actual:expr, $pat:pat, $guard:expr) => {
         match $ser.next_token() {
             Some($pat) if $guard => {}