diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-02-15 22:05:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-15 22:05:59 +0000 |
commit | 370b3a19c6848d1e99d6913f6a689207b8747129 (patch) | |
tree | 7e3671a5ec4ee34be26a735fc083c36df7861f32 | |
parent | 050b47882400c8d972ac67e43df28b0829346ba1 (diff) | |
parent | 8eae190e5a53ed5bd6ef002ae29dec4daf0ef7b9 (diff) | |
download | either-370b3a19c6848d1e99d6913f6a689207b8747129.tar.gz |
Upgrade either to 1.8.1 am: 8eae190e5a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/either/+/2438852
Change-Id: Icff7792f18c43386a2f8e2fb450aa9ab1ad64d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | README.rst | 4 |
6 files changed, 16 insertions, 12 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 5b9e1d5..b119b58 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "0e1124933c4d6a6ded1ad6137c70c69e23a9d22f" + "sha1": "b0d9a95738ac536240cf3688f67a863afda81295" }, "path_in_vcs": "" }
\ No newline at end of file @@ -42,7 +42,7 @@ rust_test { host_supported: true, crate_name: "either", cargo_env_compat: true, - cargo_pkg_version: "1.8.0", + cargo_pkg_version: "1.8.1", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, @@ -64,7 +64,7 @@ rust_library { host_supported: true, crate_name: "either", cargo_env_compat: true, - cargo_pkg_version: "1.8.0", + cargo_pkg_version: "1.8.1", srcs: ["src/lib.rs"], edition: "2018", features: [ @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.36" name = "either" -version = "1.8.0" +version = "1.8.1" authors = ["bluss"] description = """ The enum `Either` with variants `Left` and `Right` is a general purpose sum type with two cases. @@ -28,7 +28,7 @@ categories = [ "data-structures", "no-std", ] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/bluss/either" [package.metadata.release] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 5d4c933..a2768f1 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,11 +1,11 @@ [package] name = "either" -version = "1.8.0" +version = "1.8.1" authors = ["bluss"] edition = "2018" rust-version = "1.36" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/bluss/either" documentation = "https://docs.rs/either/1/" readme = "README-crates.io.md" @@ -11,13 +11,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/either/either-1.8.0.crate" + value: "https://static.crates.io/crates/either/either-1.8.1.crate" } - version: "1.8.0" + version: "1.8.1" license_type: NOTICE last_upgrade_date { - year: 2022 - month: 12 - day: 9 + year: 2023 + month: 2 + day: 15 } } @@ -31,6 +31,10 @@ How to use with cargo:: Recent Changes -------------- +- 1.8.1 + + - Clarified that the multiple licenses are combined with OR. + - 1.8.0 - **MSRV**: ``either`` now requires Rust 1.36 or later. |