diff options
Diffstat (limited to '')
-rw-r--r-- | vendor/icu_locid/src/subtags/language.rs | 11 | ||||
-rw-r--r-- | vendor/icu_locid/src/subtags/variants.rs | 28 |
2 files changed, 14 insertions, 25 deletions
diff --git a/vendor/icu_locid/src/subtags/language.rs b/vendor/icu_locid/src/subtags/language.rs index a5ec8d76e..86b51b93a 100644 --- a/vendor/icu_locid/src/subtags/language.rs +++ b/vendor/icu_locid/src/subtags/language.rs @@ -55,7 +55,6 @@ impl Language { /// use icu::locid::subtags::Language; /// /// assert_eq!(Language::default(), Language::UND); - /// assert_eq!("und", Language::UND.to_string()); /// ``` pub const UND: Self = unsafe { Self::from_raw_unchecked(*b"und") }; @@ -64,15 +63,15 @@ impl Language { /// # Examples /// /// ``` - /// use icu::locid::subtags::Language; + /// use icu::locid::{subtags::Language, subtags_language as language}; /// - /// let mut lang: Language = "csb".parse().expect("Parsing failed."); + /// let mut lang = language!("csb"); /// - /// assert_eq!(lang.as_str(), "csb"); + /// assert_ne!(lang, Language::UND); /// /// lang.clear(); /// - /// assert_eq!(lang.as_str(), "und"); + /// assert_eq!(lang, Language::UND); /// ``` #[inline] pub fn clear(&mut self) { @@ -86,7 +85,7 @@ impl Language { /// ``` /// use icu::locid::subtags::Language; /// - /// let mut lang: Language = "und".parse().expect("Parsing failed."); + /// let mut lang = Language::UND; /// /// assert!(lang.is_empty()); /// 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) |