Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 52 insertions, 51 deletions

diff --git a/vendor/zerofrom/.cargo-checksum.json b/vendor/zerofrom/.cargo-checksum.json
index c7a44c2d6..9937f5bf9 100644
--- a/vendor/zerofrom/.cargo-checksum.json
+++ b/vendor/zerofrom/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"72a566dc8765375c7e1b319843a795292a19cba360b8a36e8469271897561e95","LICENSE":"4ad7541d66a407234e2c84902124cef325c29f3e966353efdb800bedb8b8da21","README.md":"dc0e4a45a140001c02818b1f63f9253d5e84c758e46b88f206cacbc5d0401db9","src/lib.rs":"59afe6e1aa74bd1fdab7b1cafa8b5bd1ede141b5c9018d55b76ed395c2f476e3","src/macro_impls.rs":"6b4b69bdc6b94f2abb64da0c2520d3ff74aff7d14e8b4de9e8022d7ddc951f38","src/zero_from.rs":"d589da84905ca5016e91b47672ac8710f035e4da16160d17328fe520f9a6fdce"},"package":"df54d76c3251de27615dfcce21e636c172dafb2549cd7fd93e21c66f6ca6bea2"}
\ No newline at end of file
+{"files":{"Cargo.toml":"9a386f285814e4b63570332ccdf8ea87a4fc0991c45cd10dbee81e9746696ba0","LICENSE":"853f87c96f3d249f200fec6db1114427bc8bdf4afddc93c576956d78152ce978","README.md":"cd9b9a57dff5012642ee535c46a9f05424eab903f0b9f62de8bf7f815bcd5082","src/lib.rs":"59afe6e1aa74bd1fdab7b1cafa8b5bd1ede141b5c9018d55b76ed395c2f476e3","src/macro_impls.rs":"6b4b69bdc6b94f2abb64da0c2520d3ff74aff7d14e8b4de9e8022d7ddc951f38","src/zero_from.rs":"a4012c0d1945964cc112e031464bf41ed64702171d695de593defb3818dac02e"},"package":"655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7"}
\ No newline at end of file
diff --git a/vendor/zerofrom/Cargo.toml b/vendor/zerofrom/Cargo.toml
index a0da76d79..5f2b5ef42 100644
--- a/vendor/zerofrom/Cargo.toml
+++ b/vendor/zerofrom/Cargo.toml
@@ -11,13 +11,16 @@
 
 [package]
 edition = "2021"
+rust-version = "1.66"
 name = "zerofrom"
-version = "0.1.2"
+version = "0.1.3"
 authors = ["Manish Goregaokar <manishsmail@gmail.com>"]
 include = [
+    "data/**/*",
     "src/**/*",
     "examples/**/*",
     "benches/**/*",
+    "tests/**/*",
     "Cargo.toml",
     "LICENSE",
     "README.md",
@@ -35,18 +38,19 @@ categories = [
     "caching",
     "no-std",
 ]
-license = "Unicode-DFS-2016"
+license-file = "LICENSE"
 repository = "https://github.com/unicode-org/icu4x"
 
-[package.metadata.workspaces]
-independent = true
-
 [package.metadata.docs.rs]
 all-features = true
 
+[package.metadata.workspaces]
+independent = true
+
 [dependencies.zerofrom-derive]
 version = "0.1.1"
 optional = true
+default-features = false
 
 [features]
 alloc = []
diff --git a/vendor/zerofrom/LICENSE b/vendor/zerofrom/LICENSE
index 9858d01ab..9845aa5f4 100644
--- a/vendor/zerofrom/LICENSE
+++ b/vendor/zerofrom/LICENSE
@@ -1,49 +1,42 @@
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
+Copyright © 2020-2023 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
 
 —
 
diff --git a/vendor/zerofrom/README.md b/vendor/zerofrom/README.md
index d268a347e..7f171afa0 100644
--- a/vendor/zerofrom/README.md
+++ b/vendor/zerofrom/README.md
@@ -1,9 +1,13 @@
 # zerofrom [![crates.io](https://img.shields.io/crates/v/zerofrom)](https://crates.io/crates/zerofrom)
 
+<!-- cargo-rdme start -->
+
 This crate provides [`ZeroFrom`], a trait for converting types in a zero-copy way.
 
 See the documentation of [`ZeroFrom`] for more details.
 
+<!-- cargo-rdme end -->
+
 ## More Information
 
 For more information on development, authorship, contributing etc. please visit [`ICU4X home page`](https://github.com/unicode-org/icu4x).
diff --git a/vendor/zerofrom/src/zero_from.rs b/vendor/zerofrom/src/zero_from.rs
index 5b89ea5fb..204b3b635 100644
--- a/vendor/zerofrom/src/zero_from.rs
+++ b/vendor/zerofrom/src/zero_from.rs
@@ -113,9 +113,9 @@ impl<'zf, B: ToOwned + ?Sized> ZeroFrom<'zf, Cow<'_, B>> for Cow<'zf, B> {
     }
 }
 
-impl<'zf> ZeroFrom<'zf, &'_ str> for &'zf str {
+impl<'zf, T: ?Sized> ZeroFrom<'zf, &'_ T> for &'zf T {
     #[inline]
-    fn zero_from(other: &'zf &'_ str) -> &'zf str {
+    fn zero_from(other: &'zf &'_ T) -> &'zf T {
         other
     }
 }