Merging upstream version 1.69.0+dfsg1.

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

1 files changed, 9 insertions, 19 deletions

diff --git a/vendor/icu_locid/src/subtags/variants.rs b/vendor/icu_locid/src/subtags/variants.rs
index bbff9ebac..3bd83f149 100644
--- a/vendor/icu_locid/src/subtags/variants.rs
+++ b/vendor/icu_locid/src/subtags/variants.rs
@@ -16,14 +16,9 @@ use core::ops::Deref;
 /// # Examples
 ///
 /// ```
-/// use icu::locid::subtags::{Variant, Variants};
+/// use icu::locid::{subtags::Variants, subtags_variant as variant};
 ///
-/// let variant1: Variant =
-///     "posix".parse().expect("Failed to parse a variant subtag.");
-///
-/// let variant2: Variant =
-///     "macos".parse().expect("Failed to parse a variant subtag.");
-/// let mut v = vec![variant1, variant2];
+/// let mut v = vec![variant!("posix"), variant!("macos")];
 /// v.sort();
 /// v.dedup();
 ///
@@ -53,10 +48,9 @@ impl Variants {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::subtags::{Variant, Variants};
+    /// use icu::locid::{subtags::Variants, subtags_variant as variant};
     ///
-    /// let variant: Variant = "posix".parse().expect("Parsing failed.");
-    /// let variants = Variants::from_variant(variant);
+    /// let variants = Variants::from_variant(variant!("posix"));
     /// ```
     #[inline]
     pub const fn from_variant(variant: Variant) -> Self {
@@ -70,11 +64,9 @@ impl Variants {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::subtags::{Variant, Variants};
+    /// use icu::locid::{subtags::Variants, subtags_variant as variant};
     ///
-    /// let variant1: Variant = "posix".parse().expect("Parsing failed.");
-    /// let variant2: Variant = "macos".parse().expect("Parsing failed.");
-    /// let mut v = vec![variant1, variant2];
+    /// let mut v = vec![variant!("posix"), variant!("macos")];
     /// v.sort();
     /// v.dedup();
     ///
@@ -95,11 +87,9 @@ impl Variants {
     /// # Examples
     ///
     /// ```
-    /// use icu::locid::subtags::{Variant, Variants};
+    /// use icu::locid::{subtags::Variants, subtags_variant as variant};
     ///
-    /// let variant1: Variant = "posix".parse().expect("Parsing failed.");
-    /// let variant2: Variant = "macos".parse().expect("Parsing failed.");
-    /// let mut v = vec![variant1, variant2];
+    /// let mut v = vec![variant!("posix"), variant!("macos")];
     /// v.sort();
     /// v.dedup();
     ///
@@ -109,7 +99,7 @@ impl Variants {
     ///
     /// variants.clear();
     ///
-    /// assert_eq!(variants.to_string(), "");
+    /// assert_eq!(variants, Variants::default());
     /// ```
     pub fn clear(&mut self) -> Self {
         core::mem::take(self)