Merging upstream version 1.75.0+dfsg1.

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

6 files changed, 31 insertions, 19 deletions

diff --git a/vendor/icu_locid/src/subtags/language.rs b/vendor/icu_locid/src/subtags/language.rs
index 86b51b93a..6fd08a2d5 100644
--- a/vendor/icu_locid/src/subtags/language.rs
+++ b/vendor/icu_locid/src/subtags/language.rs
@@ -5,7 +5,7 @@
 impl_tinystr_subtag!(
     /// A language subtag (examples: `"en"`, `"csb"`, `"zh"`, `"und"`, etc.)
     ///
-    /// [`Language`] represents a Unicode base language code conformat to the
+    /// [`Language`] represents a Unicode base language code conformant to the
     /// [`unicode_language_id`] field of the Language and Locale Identifier.
     ///
     /// # Examples
@@ -34,7 +34,8 @@ impl_tinystr_subtag!(
     ///
     /// [`unicode_language_id`]: https://unicode.org/reports/tr35/#unicode_language_id
     Language,
-    subtags::Language,
+    subtags,
+    language,
     subtags_language,
     2..=3,
     s,
@@ -63,7 +64,7 @@ impl Language {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::{subtags::Language, subtags_language as language};
+    /// use icu::locid::subtags::{language, Language};
     ///
     /// let mut lang = language!("csb");
     ///
diff --git a/vendor/icu_locid/src/subtags/mod.rs b/vendor/icu_locid/src/subtags/mod.rs
index bd243a321..9cc04dac8 100644
--- a/vendor/icu_locid/src/subtags/mod.rs
+++ b/vendor/icu_locid/src/subtags/mod.rs
@@ -51,8 +51,12 @@ mod script;
 mod variant;
 mod variants;
 
-pub use language::Language;
-pub use region::Region;
-pub use script::Script;
-pub use variant::Variant;
+#[doc(inline)]
+pub use language::{language, Language};
+#[doc(inline)]
+pub use region::{region, Region};
+#[doc(inline)]
+pub use script::{script, Script};
+#[doc(inline)]
+pub use variant::{variant, Variant};
 pub use variants::Variants;
diff --git a/vendor/icu_locid/src/subtags/region.rs b/vendor/icu_locid/src/subtags/region.rs
index f605937ce..4348f15e7 100644
--- a/vendor/icu_locid/src/subtags/region.rs
+++ b/vendor/icu_locid/src/subtags/region.rs
@@ -5,7 +5,7 @@
 impl_tinystr_subtag!(
     /// A region subtag (examples: `"US"`, `"CN"`, `"AR"` etc.)
     ///
-    /// [`Region`] represents a Unicode base language code conformat to the
+    /// [`Region`] represents a Unicode base language code conformant to the
     /// [`unicode_region_id`] field of the Language and Locale Identifier.
     ///
     /// # Examples
@@ -19,7 +19,8 @@ impl_tinystr_subtag!(
     ///
     /// [`unicode_region_id`]: https://unicode.org/reports/tr35/#unicode_region_id
     Region,
-    subtags::Region,
+    subtags,
+    region,
     subtags_region,
     2..=3,
     s,
diff --git a/vendor/icu_locid/src/subtags/script.rs b/vendor/icu_locid/src/subtags/script.rs
index 05eb63d1c..79ead0390 100644
--- a/vendor/icu_locid/src/subtags/script.rs
+++ b/vendor/icu_locid/src/subtags/script.rs
@@ -5,7 +5,7 @@
 impl_tinystr_subtag!(
     /// A script subtag (examples: `"Latn"`, `"Arab"`, etc.)
     ///
-    /// [`Script`] represents a Unicode base language code conformat to the
+    /// [`Script`] represents a Unicode base language code conformant to the
     /// [`unicode_script_id`] field of the Language and Locale Identifier.
     ///
     /// # Examples
@@ -19,7 +19,8 @@ impl_tinystr_subtag!(
     ///
     /// [`unicode_script_id`]: https://unicode.org/reports/tr35/#unicode_script_id
     Script,
-    subtags::Script,
+    subtags,
+    script,
     subtags_script,
     4..=4,
     s,
diff --git a/vendor/icu_locid/src/subtags/variant.rs b/vendor/icu_locid/src/subtags/variant.rs
index 96fd7500e..c60b13865 100644
--- a/vendor/icu_locid/src/subtags/variant.rs
+++ b/vendor/icu_locid/src/subtags/variant.rs
@@ -5,7 +5,7 @@
 impl_tinystr_subtag!(
     /// A variant subtag (examples: `"macos"`, `"posix"`, `"1996"` etc.)
     ///
-    /// [`Variant`] represents a Unicode base language code conformat to the
+    /// [`Variant`] represents a Unicode base language code conformant to the
     /// [`unicode_variant_id`] field of the Language and Locale Identifier.
     ///
     /// # Examples
@@ -19,7 +19,8 @@ impl_tinystr_subtag!(
     ///
     /// [`unicode_variant_id`]: https://unicode.org/reports/tr35/#unicode_variant_id
     Variant,
-    subtags::Variant,
+    subtags,
+    variant,
     subtags_variant,
     4..=8,
     s,
diff --git a/vendor/icu_locid/src/subtags/variants.rs b/vendor/icu_locid/src/subtags/variants.rs
index 70aeae1d9..ba5ff1bc1 100644
--- a/vendor/icu_locid/src/subtags/variants.rs
+++ b/vendor/icu_locid/src/subtags/variants.rs
@@ -16,7 +16,7 @@ use core::ops::Deref;
 /// # Examples
 ///
 /// ```
-/// use icu::locid::{subtags::Variants, subtags_variant as variant};
+/// use icu::locid::subtags::{variant, Variants};
 ///
 /// let mut v = vec![variant!("posix"), variant!("macos")];
 /// v.sort();
@@ -48,7 +48,7 @@ impl Variants {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::{subtags::Variants, subtags_variant as variant};
+    /// use icu::locid::subtags::{variant, Variants};
     ///
     /// let variants = Variants::from_variant(variant!("posix"));
     /// ```
@@ -64,7 +64,7 @@ impl Variants {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::{subtags::Variants, subtags_variant as variant};
+    /// use icu::locid::subtags::{variant, Variants};
     ///
     /// let mut v = vec![variant!("posix"), variant!("macos")];
     /// v.sort();
@@ -77,7 +77,11 @@ impl Variants {
     /// for the caller to use [`binary_search`](slice::binary_search) instead of [`sort`](slice::sort)
     /// and [`dedup`](Vec::dedup()).
     pub fn from_vec_unchecked(input: Vec<Variant>) -> Self {
-        Self(ShortSlice::from(input))
+        Self(input.into())
+    }
+
+    pub(crate) fn from_short_slice_unchecked(input: ShortSlice<Variant>) -> Self {
+        Self(input)
     }
 
     /// Empties the [`Variants`] list.
@@ -87,7 +91,7 @@ impl Variants {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::{subtags::Variants, subtags_variant as variant};
+    /// use icu::locid::subtags::{variant, Variants};
     ///
     /// let mut v = vec![variant!("posix"), variant!("macos")];
     /// v.sort();
@@ -119,6 +123,6 @@ impl Deref for Variants {
     type Target = [Variant];
 
     fn deref(&self) -> &[Variant] {
-        self.0.as_slice()
+        self.0.deref()
     }
 }