Upgrade rust/crates/serde to 1.0.127
Test: make
Change-Id: I2a56a772eca11badc4e8052b59b091a880da1bbb
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 8dd0766..a9a9523 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,8 +74,8 @@
}
// dependent_library ["feature_list"]
-// proc-macro2-1.0.27 "default,proc-macro"
+// proc-macro2-1.0.28 "default,proc-macro"
// quote-1.0.9 "default,proc-macro"
-// serde_derive-1.0.126 "default"
-// syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+// 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 b0406b0..bda9d71 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"
-version = "1.0.126"
+version = "1.0.127"
authors = ["Erick Tryzelaar <[email protected]>", "David Tolnay <[email protected]>"]
build = "build.rs"
include = ["build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
@@ -30,7 +29,7 @@
[package.metadata.playground]
features = ["derive", "rc"]
[dependencies.serde_derive]
-version = "=1.0.126"
+version = "=1.0.127"
optional = true
[dev-dependencies.serde_derive]
version = "1.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 9f4f5de..91e813b 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "serde"
-version = "1.0.126" # remember to update html_root_url and serde_derive dependency
+version = "1.0.127" # remember to update html_root_url and serde_derive dependency
authors = ["Erick Tryzelaar <[email protected]>", "David Tolnay <[email protected]>"]
license = "MIT OR Apache-2.0"
description = "A generic serialization/deserialization framework"
@@ -14,7 +14,7 @@
build = "build.rs"
[dependencies]
-serde_derive = { version = "=1.0.126", optional = true, path = "../serde_derive" }
+serde_derive = { version = "=1.0.127", optional = true, path = "../serde_derive" }
[dev-dependencies]
serde_derive = { version = "1.0", path = "../serde_derive" }
diff --git a/METADATA b/METADATA
index 672bdd9..cc1107c 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/serde/serde-1.0.126.crate"
+ value: "https://static.crates.io/crates/serde/serde-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/de/mod.rs b/src/de/mod.rs
index 1ed7b4f..86fc382 100644
--- a/src/de/mod.rs
+++ b/src/de/mod.rs
@@ -1007,7 +1007,7 @@
/// `Deserializer`.
///
/// If the `Visitor` would benefit from taking ownership of `String` data,
- /// indiciate this to the `Deserializer` by using `deserialize_string`
+ /// indicate this to the `Deserializer` by using `deserialize_string`
/// instead.
fn deserialize_str<V>(self, visitor: V) -> Result<V::Value, Self::Error>
where
diff --git a/src/lib.rs b/src/lib.rs
index fd473b3..1c09827 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -84,7 +84,7 @@
////////////////////////////////////////////////////////////////////////////////
// Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.126")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.127")]
// Support using Serde without the standard library!
#![cfg_attr(not(feature = "std"), no_std)]
// Unstable functionality only if the user asks for it. For tracking and
diff --git a/src/private/de.rs b/src/private/de.rs
index 9199816..a387d40 100644
--- a/src/private/de.rs
+++ b/src/private/de.rs
@@ -2832,7 +2832,7 @@
where
T: DeserializeSeed<'de>,
{
- while let Some(item) = self.iter.next() {
+ for item in &mut self.iter {
// Items in the vector are nulled out when used by a struct.
if let Some((ref key, ref content)) = *item {
self.pending_content = Some(content);
@@ -2934,7 +2934,7 @@
where
T: DeserializeSeed<'de>,
{
- while let Some(item) = self.iter.next() {
+ for item in &mut self.iter {
if let Some((ref key, ref content)) = *item {
// Do not take(), instead borrow this entry. The internally tagged
// enum does its own buffering so we can't tell whether this entry
