aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2023-02-07 11:20:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-07 11:20:43 +0000
commit130fe28a1e910be15140b6346fc4e48eaa2bc1a7 (patch)
tree4ab327ce11665134b783c318f7c53c377080ede9
parent674b057b2a4e45b74d515c451e977f361073051e (diff)
parente2ec9d6411f38d42daa699caef0bc1fb093a8fcc (diff)
downloadserde_derive-130fe28a1e910be15140b6346fc4e48eaa2bc1a7.tar.gz
Upgrade serde_derive to 1.0.152 am: e2ec9d6411
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_derive/+/2419404 Change-Id: I92ed73e706f9d667df7241e0ebf78f6d831bbdae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp4
-rw-r--r--Cargo.toml2
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA10
-rw-r--r--README.md4
-rw-r--r--build.rs2
-rw-r--r--crates-io.md2
-rw-r--r--src/lib.rs2
9 files changed, 16 insertions, 14 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index ca41412..d6b3c53 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "d493649f5299106b66dfb7a99d61b38d9599f972"
+ "sha1": "ccf9c6fc072378ea8c4f15df1024e258d35d6e61"
},
"path_in_vcs": "serde_derive"
} \ No newline at end of file
diff --git a/Android.bp b/Android.bp
index f54155d..1b9abf2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,7 @@ rust_proc_macro {
name: "libserde_derive",
crate_name: "serde_derive",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.150",
+ cargo_pkg_version: "1.0.152",
srcs: ["src/lib.rs"],
edition: "2015",
features: ["default"],
@@ -57,7 +57,7 @@ rust_test_host {
name: "serde_derive_test_src_lib",
crate_name: "serde_derive",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.150",
+ cargo_pkg_version: "1.0.152",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
diff --git a/Cargo.toml b/Cargo.toml
index e268bf7..6258d9d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
[package]
rust-version = "1.31"
name = "serde_derive"
-version = "1.0.150"
+version = "1.0.152"
authors = [
"Erick Tryzelaar <erick.tryzelaar@gmail.com>",
"David Tolnay <dtolnay@gmail.com>",
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index b047f34..e1366f1 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "serde_derive"
-version = "1.0.150" # remember to update html_root_url
+version = "1.0.152" # remember to update html_root_url
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
categories = ["no-std"]
description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
diff --git a/METADATA b/METADATA
index 68bc83c..a9fa596 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/serde_derive/serde_derive-1.0.150.crate"
+ value: "https://static.crates.io/crates/serde_derive/serde_derive-1.0.152.crate"
}
- version: "1.0.150"
+ version: "1.0.152"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 12
- day: 12
+ year: 2023
+ month: 2
+ day: 6
}
}
diff --git a/README.md b/README.md
index 79409a3..c3f6575 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Serde &emsp; [![Build Status]][actions] [![Latest Version]][crates.io] [![serde: rustc 1.13+]][Rust 1.13] [![serde_derive: rustc 1.31+]][Rust 1.31]
-[Build Status]: https://img.shields.io/github/workflow/status/serde-rs/serde/CI/master
+[Build Status]: https://img.shields.io/github/actions/workflow/status/serde-rs/serde/ci.yml?branch=master
[actions]: https://github.com/serde-rs/serde/actions?query=branch%3Amaster
[Latest Version]: https://img.shields.io/crates/v/serde.svg
[crates.io]: https://crates.io/crates/serde
@@ -19,7 +19,7 @@ You may be looking for:
- [Data formats supported by Serde](https://serde.rs/#data-formats)
- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/derive.html)
- [Examples](https://serde.rs/examples.html)
-- [API documentation](https://docs.serde.rs/serde/)
+- [API documentation](https://docs.rs/serde)
- [Release notes](https://github.com/serde-rs/serde/releases)
## Serde in action
diff --git a/build.rs b/build.rs
index 2aece04..1249dab 100644
--- a/build.rs
+++ b/build.rs
@@ -6,6 +6,8 @@ use std::str;
// opening a GitHub issue if your build environment requires some way to enable
// these cfgs other than by executing our build script.
fn main() {
+ println!("cargo:rerun-if-changed=build.rs");
+
let minor = match rustc_minor_version() {
Some(minor) => minor,
None => return,
diff --git a/crates-io.md b/crates-io.md
index b57bc5f..6e0ec28 100644
--- a/crates-io.md
+++ b/crates-io.md
@@ -10,7 +10,7 @@ You may be looking for:
- [Data formats supported by Serde](https://serde.rs/#data-formats)
- [Setting up `#[derive(Serialize, Deserialize)]`](https://serde.rs/derive.html)
- [Examples](https://serde.rs/examples.html)
-- [API documentation](https://docs.serde.rs/serde/)
+- [API documentation](https://docs.rs/serde)
- [Release notes](https://github.com/serde-rs/serde/releases)
## Serde in action
diff --git a/src/lib.rs b/src/lib.rs
index 13b2103..4100789 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,7 +13,7 @@
//!
//! [https://serde.rs/derive.html]: https://serde.rs/derive.html
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.150")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.152")]
#![allow(unknown_lints, bare_trait_objects)]
// Ignored clippy lints
#![allow(