diff options
author | Joel Galenson <jgalenson@google.com> | 2021-05-20 12:55:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-20 12:55:37 +0000 |
commit | bf022415247dc25d8a82801c1c43c9e0b7fcaea4 (patch) | |
tree | 37925ef6061b4daebc180cb1975c213f255335cf | |
parent | 0fd08b8ee5108d009154ac2ed30c2a0ce6b4b824 (diff) | |
parent | 8808fe1a9f28ffe162126344eccbf99de995e1f1 (diff) | |
download | serde_test-android-s-beta-4.tar.gz |
Upgrade rust/crates/serde_test to 1.0.126 am: 8808fe1a9fandroid-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_test/+/1713248
Change-Id: Id6cb2187b5f04b72dc165aabbb51704d1738e0e8
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 13 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | src/lib.rs | 4 |
6 files changed, 17 insertions, 14 deletions
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" } } @@ -1,4 +1,5 @@ // This file is generated by cargo2android.py --run --device --dependencies --tests. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_serde_test_license"], @@ -75,9 +76,9 @@ rust_test { } // dependent_library ["feature_list"] -// proc-macro2-1.0.24 "default,proc-macro" -// quote-1.0.8 "default,proc-macro" -// serde-1.0.123 "default,std" -// serde_derive-1.0.123 "default" -// 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" +// 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" +// unicode-xid-0.2.2 "default" @@ -12,7 +12,7 @@ [package] name = "serde_test" -version = "1.0.123" +version = "1.0.126" 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 a5e6bd7..0237d18 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "serde_test" -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 = "Token De/Serializer for testing De/Serialize implementations" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/serde_test/serde_test-1.0.123.crate" + value: "https://static.crates.io/crates/serde_test/serde_test-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 } } @@ -144,7 +144,7 @@ //! # } //! ``` -#![doc(html_root_url = "https://docs.rs/serde_test/1.0.123")] +#![doc(html_root_url = "https://docs.rs/serde_test/1.0.126")] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))] // Ignored clippy lints @@ -153,8 +153,10 @@ #![cfg_attr( feature = "cargo-clippy", allow( + cloned_instead_of_copied, empty_line_after_outer_attr, missing_docs_in_private_items, + missing_panics_doc, module_name_repetitions, must_use_candidate, redundant_field_names, |