Upgrade rust/crates/serde_derive to 1.0.126
Test: make
Change-Id: Id6dc1c3f6dc5e5c7632c899d764156d2f08c8b61
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 71f38ef..d265e4c 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "3d6c4149b177e9cadfb948ebc6d1e55b33861792"
+ "sha1": "d9c338ec4abd1dd6fdd305e208bff1fd7faaabff"
}
}
diff --git a/Android.bp b/Android.bp
index 89739c0..0d9b267 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
// This file is generated by cargo2android.py --run --device --dependencies.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_serde_derive_license"],
@@ -42,9 +43,7 @@
srcs: ["src/lib.rs"],
edition: "2015",
features: ["default"],
- flags: [
- "--cfg underscore_consts",
- ],
+ cfgs: ["underscore_consts"],
rustlibs: [
"libproc_macro2",
"libquote",
@@ -53,7 +52,7 @@
}
// dependent_library ["feature_list"]
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.8 "default,proc-macro"
-// syn-1.0.60 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.1 "default"
+// proc-macro2-1.0.26 "default,proc-macro"
+// quote-1.0.9 "default,proc-macro"
+// syn-1.0.72 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+// unicode-xid-0.2.2 "default"
diff --git a/Cargo.toml b/Cargo.toml
index 389d48c..0f9aa95 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "serde_derive"
-version = "1.0.123"
+version = "1.0.126"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
include = ["build.rs", "src/**/*.rs", "crates-io.md", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 24e2f6b..d192547 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "serde_derive"
-version = "1.0.123" # remember to update html_root_url
+version = "1.0.126" # 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 = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
diff --git a/METADATA b/METADATA
index aea0a1a..9c137c9 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/serde_derive/serde_derive-1.0.123.crate"
+ value: "https://static.crates.io/crates/serde_derive/serde_derive-1.0.126.crate"
}
- version: "1.0.123"
+ version: "1.0.126"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 2
- day: 9
+ month: 5
+ day: 19
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index f4547bb..60d6c91 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,13 +2,55 @@
{
"presubmit": [
{
- "name": "url_device_test_src_lib"
+ "name": "ZipFuseTest"
+ },
+ {
+ "name": "authfs_device_test_src_lib"
+ },
+ {
+ "name": "either_device_test_src_lib"
+ },
+ {
+ "name": "serde_cbor_device_test_src_lib"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_bennofs"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_canonical"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_de"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_enum"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_ser"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_std_types"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_tags"
+ },
+ {
+ "name": "serde_cbor_device_test_tests_value"
+ },
+ {
+ "name": "serde_test_device_test_src_lib"
},
{
"name": "unicode-bidi_device_test_src_lib"
},
{
- "name": "serde_test_device_test_src_lib"
+ "name": "url_device_test_src_lib"
+ },
+ {
+ "name": "url_device_test_tests_data"
+ },
+ {
+ "name": "url_device_test_tests_unit"
}
]
}
diff --git a/src/bound.rs b/src/bound.rs
index 0949dfc..6d7402c 100644
--- a/src/bound.rs
+++ b/src/bound.rs
@@ -49,7 +49,7 @@
let predicates = cont
.data
.all_fields()
- .flat_map(|field| from_field(&field.attrs))
+ .filter_map(|field| from_field(&field.attrs))
.flat_map(|predicates| predicates.to_vec());
let mut generics = generics.clone();
@@ -71,7 +71,7 @@
let predicates = variants
.iter()
- .flat_map(|variant| from_variant(&variant.attrs))
+ .filter_map(|variant| from_variant(&variant.attrs))
.flat_map(|predicates| predicates.to_vec());
let mut generics = generics.clone();
diff --git a/src/dummy.rs b/src/dummy.rs
index 9a4e5f0..29de260 100644
--- a/src/dummy.rs
+++ b/src/dummy.rs
@@ -23,7 +23,7 @@
use #path as _serde;
},
None => quote! {
- #[allow(rust_2018_idioms, clippy::useless_attribute)]
+ #[allow(unused_extern_crates, clippy::useless_attribute)]
extern crate serde as _serde;
},
};
diff --git a/src/lib.rs b/src/lib.rs
index f4a93ae..8daa36e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,13 +13,17 @@
//!
//! [https://serde.rs/derive.html]: https://serde.rs/derive.html
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.123")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.126")]
#![allow(unknown_lints, bare_trait_objects)]
#![deny(clippy::all, clippy::pedantic)]
// Ignored clippy lints
#