diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-17 06:59:42 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-17 06:59:42 +0000 |
commit | 48d4910bdd12c80ba4673e56cb878674ee8a1788 (patch) | |
tree | 7e3671a5ec4ee34be26a735fc083c36df7861f32 | |
parent | f145755e1f0e6a1ccb24f965d6a685589ffe5f49 (diff) | |
parent | 1a0ce37449e32ac844c762237c3466b9b1bb64ac (diff) | |
download | either-48d4910bdd12c80ba4673e56cb878674ee8a1788.tar.gz |
Snap for 9620104 from 1a0ce37449e32ac844c762237c3466b9b1bb64ac to udc-d1-release
Change-Id: Ie4601178f6e5c57da9fa35f3d6fc2a193fbeaec1
-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. |