Move preferences to icu_locale_core (#5630)

Fixes #5179

Cargo.toml

@@ -71,7 +71,6 @@ members = [
     "utils/fixed_decimal",
     "utils/ixdtf",
     "utils/litemap",
-    "utils/preferences",
     "utils/resb",
     "utils/env_preferences",
     "utils/tinystr",

components/locale_core/src/extensions/unicode/mod.rs

@@ -42,6 +42,7 @@ pub use attributes::Attributes;
 #[doc(inline)]
 pub use key::{key, Key};
 pub use keywords::Keywords;
+#[doc(inline)]
 pub use subdivision::{subdivision_suffix, SubdivisionId, SubdivisionSuffix};
 #[doc(inline)]
 pub use value::{value, Value};

components/locale_core/src/lib.rs

@@ -80,6 +80,7 @@ pub use parser::errors::ParseError;
 pub mod extensions;
 #[macro_use]
 pub mod subtags;
+pub mod preferences;
 pub mod zerovec;
 
 #[cfg(feature = "serde")]

utils/preferences/src/extensions/mod.rs → components/locale_core/src/preferences/extensions/mod.rs

@@ -2,5 +2,6 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-/// TODO
+//! TODO
+
 pub mod unicode;

utils/preferences/src/extensions/unicode/keywords/calendar.rs → components/locale_core/src/preferences/extensions/unicode/keywords/calendar.rs

@@ -4,7 +4,7 @@
 
 #![allow(non_snake_case)]
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 // https://github.com/unicode-org/cldr/blob/main/common/bcp47/calendar.xml
 enum_keyword!(

utils/preferences/src/extensions/unicode/keywords/collation.rs → components/locale_core/src/preferences/extensions/unicode/keywords/collation.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/currency.rs → components/locale_core/src/preferences/extensions/unicode/keywords/currency.rs

@@ -2,9 +2,9 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::errors::PreferencesParseError;
-use crate::extensions::unicode::struct_keyword;
-use icu_locale_core::{extensions::unicode::Value, subtags::Subtag};
+use crate::preferences::extensions::unicode::errors::PreferencesParseError;
+use crate::preferences::extensions::unicode::struct_keyword;
+use crate::{extensions::unicode::Value, subtags::Subtag};
 use tinystr::TinyAsciiStr;
 
 struct_keyword!(
@@ -22,7 +22,7 @@ struct_keyword!(
         Err(PreferencesParseError::InvalidKeywordValue)
     },
     |input: CurrencyType| {
-        icu_locale_core::extensions::unicode::Value::from_subtag(Some(
+        crate::extensions::unicode::Value::from_subtag(Some(
             Subtag::from_tinystr_unvalidated(input.0.resize()),
         ))
     }

utils/preferences/src/extensions/unicode/keywords/currency_format.rs → components/locale_core/src/preferences/extensions/unicode/keywords/currency_format.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/dictionary_break.rs → components/locale_core/src/preferences/extensions/unicode/keywords/dictionary_break.rs

@@ -2,12 +2,12 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::errors::PreferencesParseError;
-use crate::extensions::unicode::struct_keyword;
+use crate::extensions::unicode::Value;
+use crate::preferences::extensions::unicode::errors::PreferencesParseError;
+use crate::preferences::extensions::unicode::struct_keyword;
+use crate::subtags::Script;
 use alloc::vec::Vec;
 use core::str::FromStr;
-use icu_locale_core::extensions::unicode::Value;
-use icu_locale_core::subtags::Script;
 
 struct_keyword!(
     /// TODO
@@ -24,6 +24,6 @@ struct_keyword!(
             .map(Self)
     },
     |input: DictionaryBreakScriptExclusions| {
-        icu_locale_core::extensions::unicode::Value::from_iter(input.0.into_iter().map(Into::into))
+        crate::extensions::unicode::Value::from_iter(input.0.into_iter().map(Into::into))
     }
 );

utils/preferences/src/extensions/unicode/keywords/emoji.rs → components/locale_core/src/preferences/extensions/unicode/keywords/emoji.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/first_day.rs → components/locale_core/src/preferences/extensions/unicode/keywords/first_day.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/hour_cycle.rs → components/locale_core/src/preferences/extensions/unicode/keywords/hour_cycle.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/line_break.rs → components/locale_core/src/preferences/extensions/unicode/keywords/line_break.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/line_break_word.rs → components/locale_core/src/preferences/extensions/unicode/keywords/line_break_word.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/measurement_system.rs → components/locale_core/src/preferences/extensions/unicode/keywords/measurement_system.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/measurement_unit_override.rs → components/locale_core/src/preferences/extensions/unicode/keywords/measurement_unit_override.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/numbering_system.rs → components/locale_core/src/preferences/extensions/unicode/keywords/numbering_system.rs

@@ -2,9 +2,9 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::errors::PreferencesParseError;
-use crate::extensions::unicode::struct_keyword;
-use icu_locale_core::{extensions::unicode::Value, subtags::Subtag};
+use crate::preferences::extensions::unicode::errors::PreferencesParseError;
+use crate::preferences::extensions::unicode::struct_keyword;
+use crate::{extensions::unicode::Value, subtags::Subtag};
 
 struct_keyword!(
     /// TODO
@@ -18,6 +18,6 @@ struct_keyword!(
             .ok_or(PreferencesParseError::InvalidKeywordValue)
     },
     |input: NumberingSystem| {
-        icu_locale_core::extensions::unicode::Value::from_subtag(Some(input.0))
+        crate::extensions::unicode::Value::from_subtag(Some(input.0))
     }
 );

utils/preferences/src/extensions/unicode/keywords/region_override.rs → components/locale_core/src/preferences/extensions/unicode/keywords/region_override.rs

@@ -2,13 +2,13 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::errors::PreferencesParseError;
-use crate::extensions::unicode::struct_keyword;
-use alloc::string::ToString;
-use icu_locale_core::{
+use crate::preferences::extensions::unicode::errors::PreferencesParseError;
+use crate::preferences::extensions::unicode::struct_keyword;
+use crate::{
     extensions::unicode::{SubdivisionId, Value},
     subtags::Subtag,
 };
+use alloc::string::ToString;
 
 struct_keyword!(
     /// TODO
@@ -30,9 +30,9 @@ struct_keyword!(
 #[cfg(test)]
 mod test {
     use super::*;
-    use icu_locale_core::extensions::unicode;
-    use icu_locale_core::extensions::unicode::subdivision_suffix;
-    use icu_locale_core::subtags::region;
+    use crate::extensions::unicode;
+    use crate::extensions::unicode::subdivision_suffix;
+    use crate::subtags::region;
 
     #[test]
     fn region_override_test() {

utils/preferences/src/extensions/unicode/keywords/regional_subdivision.rs → components/locale_core/src/preferences/extensions/unicode/keywords/regional_subdivision.rs

@@ -4,13 +4,13 @@
 
 use core::ops::Deref;
 
-use crate::extensions::unicode::errors::PreferencesParseError;
-use crate::extensions::unicode::struct_keyword;
-use alloc::string::ToString;
-use icu_locale_core::{
+use crate::preferences::extensions::unicode::errors::PreferencesParseError;
+use crate::preferences::extensions::unicode::struct_keyword;
+use crate::{
     extensions::unicode::{SubdivisionId, Value},
     subtags::Subtag,
 };
+use alloc::string::ToString;
 
 struct_keyword!(
     /// TODO
@@ -40,9 +40,9 @@ impl Deref for RegionalSubdivision {
 #[cfg(test)]
 mod test {
     use super::*;
-    use icu_locale_core::extensions::unicode;
-    use icu_locale_core::extensions::unicode::subdivision_suffix;
-    use icu_locale_core::subtags::region;
+    use crate::extensions::unicode;
+    use crate::extensions::unicode::subdivision_suffix;
+    use crate::subtags::region;
 
     #[test]
     fn region_subdivision_test() {

utils/preferences/src/extensions/unicode/keywords/sentence_supression.rs → components/locale_core/src/preferences/extensions/unicode/keywords/sentence_supression.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/keywords/timezone.rs → components/locale_core/src/preferences/extensions/unicode/keywords/timezone.rs

@@ -2,9 +2,9 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::errors::PreferencesParseError;
-use crate::extensions::unicode::struct_keyword;
-use icu_locale_core::{extensions::unicode::Value, subtags::Subtag};
+use crate::preferences::extensions::unicode::errors::PreferencesParseError;
+use crate::preferences::extensions::unicode::struct_keyword;
+use crate::{extensions::unicode::Value, subtags::Subtag};
 
 struct_keyword!(
     /// TODO
@@ -18,6 +18,6 @@ struct_keyword!(
             .ok_or(PreferencesParseError::InvalidKeywordValue)
     },
     |input: TimeZoneShortId| {
-        icu_locale_core::extensions::unicode::Value::from_subtag(Some(input.0))
+        crate::extensions::unicode::Value::from_subtag(Some(input.0))
     }
 );

utils/preferences/src/extensions/unicode/keywords/variant.rs → components/locale_core/src/preferences/extensions/unicode/keywords/variant.rs

@@ -2,7 +2,7 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-use crate::extensions::unicode::enum_keyword;
+use crate::preferences::extensions::unicode::enum_keyword;
 
 enum_keyword!(
     /// TODO

utils/preferences/src/extensions/unicode/macros/enum_keyword.rs → components/locale_core/src/preferences/extensions/unicode/macros/enum_keyword.rs

@@ -39,7 +39,7 @@ macro_rules! __enum_keyword {
 
         impl $name {
             /// TODO
-            pub fn extend_value(self, input: &mut icu_locale_core::extensions::unicode::Value) {
+            pub fn extend_value(self, input: &mut $crate::extensions::unicode::Value) {
                 match self {
                     $(
                         // This is circumventing a limitation of the macro_rules - we need to have a conditional
@@ -48,7 +48,7 @@ macro_rules! __enum_keyword {
                         // complaints.
                         #[allow(non_snake_case)]
                         Self::$variant $(($v2))? => {
-                            input.push_subtag(icu_locale_core::subtags::subtag!($key));
+                            input.push_subtag($crate::subtags::subtag!($key));
 
                             $(
                                 if let Some(v2) = $v2 {
@@ -61,10 +61,10 @@ macro_rules! __enum_keyword {
             }
             }
 
-        impl TryFrom<icu_locale_core::extensions::unicode::Value> for $name {
-            type Error = $crate::extensions::unicode::errors::PreferencesParseError;
+        impl TryFrom<$crate::extensions::unicode::Value> for $name {
+            type Error = $crate::preferences::extensions::unicode::errors::PreferencesParseError;
 
-            fn try_from(mut s: icu_locale_core::extensions::unicode::Value) -> Result<Self, Self::Error> {
+            fn try_from(mut s: $crate::extensions::unicode::Value) -> Result<Self, Self::Error> {
                 let first_subtag = s.get_subtag(0).unwrap();
                 Ok(match first_subtag.as_str() {
                     $(
@@ -80,9 +80,9 @@ macro_rules! __enum_keyword {
             }
         }
 
-        impl From<$name>  for icu_locale_core::extensions::unicode::Value {
-            fn from(input: $name) -> icu_locale_core::extensions::unicode::Value {
-                let mut result = icu_locale_core::extensions::unicode::Value::default();
+        impl From<$name>  for $crate::extensions::unicode::Value {
+            fn from(input: $name) -> $crate::extensions::unicode::Value {
+                let mut result = $crate::extensions::unicode::Value::default();
                 input.extend_value(&mut result);
                 result
             }
@@ -93,16 +93,16 @@ macro_rules! __enum_keyword {
     }, $ext_key:literal) => {
         $crate::__enum_keyword!($(#[$doc])* $name {$($key => $variant $(($v2) {$($subk => $subv),*})?),*});
 
-        impl $crate::PreferenceKey for $name {
-            fn unicode_extension_key() -> Option<icu_locale_core::extensions::unicode::Key> {
-                Some(icu_locale_core::extensions::unicode::key!($ext_key))
+        impl $crate::preferences::PreferenceKey for $name {
+            fn unicode_extension_key() -> Option<$crate::extensions::unicode::Key> {
+                Some($crate::extensions::unicode::key!($ext_key))
             }
 
             fn is_custom(&self) -> bool {
                 false
             }
 
-            fn unicode_extension_value(&self) -> Option<icu_locale_core::extensions::unicode::Value> {
+            fn unicode_extension_value(&self) -> Option<$crate::extensions::unicode::Value> {
                 Some(self.clone().into())
             }
         }
@@ -113,8 +113,8 @@ pub use __enum_keyword as enum_keyword;
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::extensions::unicode;
     use core::str::FromStr;
-    use icu_locale_core::extensions::unicode;
 
     #[test]
     fn enum_keywords_test() {

utils/preferences/src/extensions/unicode/macros/mod.rs → components/locale_core/src/preferences/extensions/unicode/macros/mod.rs

@@ -5,5 +5,7 @@
 mod enum_keyword;
 mod struct_keyword;
 
+#[doc(inline)]
 pub use enum_keyword::{enum_keyword, enum_keyword_inner};
+#[doc(inline)]
 pub use struct_keyword::struct_keyword;