diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
| commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
| tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/either | |
| parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
| download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip | |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/either')
| -rw-r--r-- | vendor/either/.cargo-checksum.json | 2 | ||||
| -rw-r--r-- | vendor/either/Cargo.toml | 4 | ||||
| -rw-r--r-- | vendor/either/README.rst | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/vendor/either/.cargo-checksum.json b/vendor/either/.cargo-checksum.json index 5e1f8841d..d8d57c256 100644 --- a/vendor/either/.cargo-checksum.json +++ b/vendor/either/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"321950b99b4f04079e2470d754419bedba9851b71d1a2d8bd9c9046e38b87640","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7576269ea71f767b99297934c0b2367532690f8c4badc695edf8e04ab6a1e545","README-crates.io.md":"b775991a01ab4a0a8de6169f597775319d9ce8178f5c74ccdc634f13a286b20c","README.rst":"1369598deaae0ff925e8910df42354d33a43606961c40e7b71a7454a7f0b775e","src/lib.rs":"bc950126c901ea5c12ce4d02a7e58e3b1e2b428caca68bd510bad1f2488e2ced","src/serde_untagged.rs":"e826ee0ab31616e49c3e3f3711c8441001ee424b3e7a8c4c466cfcc4f8a7701a","src/serde_untagged_optional.rs":"86265f09d0795428bb2ce013b070d1badf1e2210217844a9ff3f04b2795868ab"},"package":"90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"}
\ No newline at end of file +{"files":{"Cargo.toml":"b20d074285d90e1472c25d78afdf9e642b8b7eb0ffd5f2c5dd8d1eb895d2aa12","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"7576269ea71f767b99297934c0b2367532690f8c4badc695edf8e04ab6a1e545","README-crates.io.md":"b775991a01ab4a0a8de6169f597775319d9ce8178f5c74ccdc634f13a286b20c","README.rst":"9b9a9a7712486d06a4d96068b76cf4ac2f0518f98b8b1a1587257868d1e9cce4","src/lib.rs":"bc950126c901ea5c12ce4d02a7e58e3b1e2b428caca68bd510bad1f2488e2ced","src/serde_untagged.rs":"e826ee0ab31616e49c3e3f3711c8441001ee424b3e7a8c4c466cfcc4f8a7701a","src/serde_untagged_optional.rs":"86265f09d0795428bb2ce013b070d1badf1e2210217844a9ff3f04b2795868ab"},"package":"7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"}
\ No newline at end of file diff --git a/vendor/either/Cargo.toml b/vendor/either/Cargo.toml index eb1c5b4b5..028ae0ebc 100644 --- a/vendor/either/Cargo.toml +++ b/vendor/either/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/vendor/either/README.rst b/vendor/either/README.rst index 43c156a9f..be27fc105 100644 --- a/vendor/either/README.rst +++ b/vendor/either/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. |