aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-09-23 15:26:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-23 15:26:36 +0000
commitdb04c47c3f6577a984aa7a9ca5e91114348e118b (patch)
treededa0adc19abde80ac57c41ba64daa09646d8b52
parent825a6909d126361fe990aa7d058bc9e1d350632b (diff)
parent992088bd8e695a171c3c2c2f28db341fda0dbcb2 (diff)
downloadderive_arbitrary-db04c47c3f6577a984aa7a9ca5e91114348e118b.tar.gz
Upgrade rust/crates/derive_arbitrary to 1.0.2 am: 524180253e am: 64cd4627af am: 8783cf042f am: 27b9ab0e04 am: 992088bd8e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/derive_arbitrary/+/1832883 Change-Id: I220ffac89f0472f94b57943ed8bdee2efe49a2dc
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp10
-rw-r--r--Cargo.toml11
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA8
5 files changed, 14 insertions, 19 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 262c88c..2d96982 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "5ec3b33f05e8e993688ab872ca5e1a24f4802ebe"
+ "sha1": "ef27875e0311786ca5210a734c6288cb5d920614"
}
}
diff --git a/Android.bp b/Android.bp
index e1c3d18..80237a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --device.
+// This file is generated by cargo2android.py --run --device.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,6 +42,8 @@ license {
rust_proc_macro {
name: "libderive_arbitrary",
crate_name: "derive_arbitrary",
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.0.2",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -50,9 +52,3 @@ rust_proc_macro {
"libsyn",
],
}
-
-// dependent_library ["feature_list"]
-// proc-macro2-1.0.27 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// syn-1.0.73 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.2 "default"
diff --git a/Cargo.toml b/Cargo.toml
index ab39b19..0bf12a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,17 +3,16 @@
# 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]
edition = "2018"
name = "derive_arbitrary"
-version = "1.0.1"
+version = "1.0.2"
authors = ["The Rust-Fuzz Project Developers", "Nick Fitzgerald <fitzgen@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>", "Andre Bogus <bogusandre@gmail.com>", "Corey Farwell <coreyf@rwell.org>"]
description = "Derives arbitrary traits"
documentation = "https://docs.rs/arbitrary/"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index b9fc782..8b7ce1a 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "derive_arbitrary"
-version = "1.0.1" # Make sure it matches the version of the arbitrary crate itself.
+version = "1.0.2" # Make sure it matches the version of the arbitrary crate itself.
authors = [
"The Rust-Fuzz Project Developers",
"Nick Fitzgerald <fitzgen@gmail.com>",
diff --git a/METADATA b/METADATA
index aa885fb..657b085 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.0.1.crate"
+ value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.0.2.crate"
}
- version: "1.0.1"
+ version: "1.0.2"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 6
- day: 21
+ month: 9
+ day: 22
}
}