Snap for 8730993 from 9f7b1a1f2fe0fba43134c7c805c6d4ed6eee4fc9 to mainline-tzdata3-release
Change-Id: Ifb773d376a5314cedb4496969caf165cc872d15d
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 9712a81..cfe44cd 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,5 @@
{
"git": {
- "sha1": "d0d238d880276fd617c38f7e4712bf40db58aad6"
- },
- "path_in_vcs": "derive"
-}
\ No newline at end of file
+ "sha1": "83b852c9bba47359ad33fc5b1f81f29425bc97e8"
+ }
+}
diff --git a/Android.bp b/Android.bp
index b3caae1..44d059f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo2android.py --run --dependencies --device.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -42,8 +42,6 @@
rust_proc_macro {
name: "libderive_arbitrary",
crate_name: "derive_arbitrary",
- cargo_env_compat: true,
- cargo_pkg_version: "1.1.0",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -52,3 +50,9 @@
"libsyn",
],
}
+
+// dependent_library ["feature_list"]
+// proc-macro2-1.0.26 "default,proc-macro"
+// quote-1.0.9 "default,proc-macro"
+// syn-1.0.68 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+// unicode-xid-0.2.1 "default"
diff --git a/Cargo.toml b/Cargo.toml
index d749034..3267e55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,39 +3,28 @@
# 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 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.
+# 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)
[package]
edition = "2018"
name = "derive_arbitrary"
-version = "1.1.0"
-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>",
-]
+version = "1.0.0"
+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/"
readme = "README.md"
-keywords = [
- "arbitrary",
- "testing",
- "derive",
- "macro",
-]
+keywords = ["arbitrary", "testing", "derive", "macro"]
categories = ["development-tools::testing"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rust-fuzz/arbitrary"
[lib]
proc_macro = true
-
[dependencies.proc-macro2]
version = "1.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index acdd379..95c548e 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "derive_arbitrary"
-version = "1.1.0" # Make sure it matches the version of the arbitrary crate itself.
+version = "1.0.0" # 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 f875682..710fe50 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.1.0.crate"
+ value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.0.0.crate"
}
- version: "1.1.0"
+ version: "1.0.0"
license_type: NOTICE
last_upgrade_date {
- year: 2022
- month: 3
+ year: 2021
+ month: 4
day: 1
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index d6cefe5..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
- "imports": [
- {
- "path": "external/rust/crates/arbitrary"
- }
- ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "device": true,
- "run": true
-}
\ No newline at end of file
