Upgrade either to 1.8.1 am: 8eae190e5a am: 370b3a19c6 am: 67d07996ae

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/either/+/2438852

Change-Id: I1b8428e15c128b7c8244f517520c296e95c821fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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
diff --git a/Android.bp b/Android.bp
index 4bd81e9..8235b53 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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: [
diff --git a/Cargo.toml b/Cargo.toml
index eb1c5b4..028ae0e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
diff --git a/METADATA b/METADATA
index 5140042..535787f 100644
--- a/METADATA
+++ b/METADATA
@@ -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
   }
 }
diff --git a/README.rst b/README.rst
index 43c156a..be27fc1 100644
--- a/README.rst
+++ b/README.rst
@@ -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.