aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-04-06 14:25:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-06 14:25:50 +0000
commitb3c09da3a1047b7e18344f3ac81f7471f5577ce4 (patch)
treedca177db23ee93c5942c4b6c35f44c4edc00271f
parentee3cf3bc27149805c46fdb0cae7056350c7c6523 (diff)
parent256dbd5fd747da3477e9c3578dbca5125423135f (diff)
downloadarbitrary-android12-qpr3-release.tar.gz
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/arbitrary/+/1662316 Change-Id: I26dbe97a89acc5a6fc57239011b9f1754be6f710
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp9
-rw-r--r--CHANGELOG.md15
-rw-r--r--Cargo.toml4
-rw-r--r--Cargo.toml.orig4
-rw-r--r--METADATA8
-rw-r--r--README.md2
-rw-r--r--src/lib.rs2
8 files changed, 27 insertions, 19 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 36e1045..cfe44cd 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "89a6e201efdbfe6bd1495e15ded0b1a67d651525"
+ "sha1": "83b852c9bba47359ad33fc5b1f81f29425bc97e8"
}
}
diff --git a/Android.bp b/Android.bp
index f271d73..b90737f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
// This file is generated by cargo2android.py --run --dependencies --device --features derive --patch patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_arbitrary_license"],
@@ -49,8 +50,8 @@ rust_library_rlib {
}
// dependent_library ["feature_list"]
-// derive_arbitrary-1.0.0-rc2
-// 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"
+// derive_arbitrary-1.0.0
+// 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/CHANGELOG.md b/CHANGELOG.md
index e4d4268..6542d53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,8 +28,19 @@ Released YYYY-MM-DD.
--------------------------------------------------------------------------------
+## 1.0.0
+
+Released 2020-02-24.
+
+See 1.0.0-rc1 and 1.0.0-rc2 for changes since 0.4.7, which was the last main
+line release.
+
+--------------------------------------------------------------------------------
+
## 1.0.0-rc2
+Released 2021-02-09.
+
### Added
* The `Arbitrary` trait is now implemented for `&[u8]`. [#67](https://github.com/rust-fuzz/arbitrary/pull/67)
@@ -39,10 +50,6 @@ Released YYYY-MM-DD.
* Rename `Unstructured#get_bytes` to `Unstructured#bytes`. [#70](https://github.com/rust-fuzz/arbitrary/pull/70)
* Passing an empty slice of choices to `Unstructured#choose` returns an error. Previously it would panic. [71](https://github.com/rust-fuzz/arbitrary/pull/71)
-### Removed
-
-*
-
--------------------------------------------------------------------------------
## 1.0.0-rc1
diff --git a/Cargo.toml b/Cargo.toml
index 5f5ff2d..b57a351 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "arbitrary"
-version = "1.0.0-rc2"
+version = "1.0.0"
authors = ["The Rust-Fuzz Project Developers", "Nick Fitzgerald <fitzgen@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>", "Simonas Kazlauskas <arbitrary@kazlauskas.me>", "Brian L. Troutwine <brian@troutwine.us>", "Corey Farwell <coreyf@rwell.org>"]
description = "The trait for generating structured data from unstructured data"
documentation = "https://docs.rs/arbitrary/"
@@ -32,7 +32,7 @@ name = "derive"
path = "./tests/derive.rs"
required-features = ["derive"]
[dependencies.derive_arbitrary]
-version = "1.0.0-rc1"
+version = "1.0.0"
optional = true
[dev-dependencies]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 3ca96bd..f177ed4 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "arbitrary"
-version = "1.0.0-rc2" # Make sure this matches the derive crate version
+version = "1.0.0" # Make sure this matches the derive crate version
authors = [
"The Rust-Fuzz Project Developers",
"Nick Fitzgerald <fitzgen@gmail.com>",
@@ -19,7 +19,7 @@ repository = "https://github.com/rust-fuzz/arbitrary/"
documentation = "https://docs.rs/arbitrary/"
[dependencies]
-derive_arbitrary = { version = "1.0.0-rc1", path = "./derive", optional = true }
+derive_arbitrary = { version = "1.0.0", path = "./derive", optional = true }
[dev-dependencies]
diff --git a/METADATA b/METADATA
index 99531d8..1029866 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/arbitrary/arbitrary-1.0.0-rc2.crate"
+ value: "https://static.crates.io/crates/arbitrary/arbitrary-1.0.0.crate"
}
- version: "1.0.0-rc2"
+ version: "1.0.0"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 2
- day: 9
+ month: 4
+ day: 1
}
}
diff --git a/README.md b/README.md
index 66bf2d1..fce547a 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ feature:
# Cargo.toml
[dependencies]
-arbitrary = { version = "0.4", features = ["derive"] }
+arbitrary = { version = "1", features = ["derive"] }
```
And then you can simply add `#[derive(Arbitrary)]` annotations to your types:
diff --git a/src/lib.rs b/src/lib.rs
index 9a52e47..48898a8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -64,7 +64,7 @@ use std::sync::{Arc, Mutex};
///
/// ```toml
/// [dependencies]
-/// arbitrary = { version = "0.4", features = ["derive"] }
+/// arbitrary = { version = "1", features = ["derive"] }
/// ```
///
/// Then, you add the `#[derive(Arbitrary)]` annotation to your `struct` or