Move icu_pattern to components (#5625)

#5179
unicode-org · Oct 1, 2024 · 786b561 · 786b561
1 parent 0006d90
commit 786b561
Show file tree

Hide file tree

Showing 24 changed files with 55 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,6 +24,7 @@ members = [
     "components/list",
     "components/locale",
     "components/normalizer",
+    "components/pattern",
     "components/plurals",
     "components/properties",
     "components/segmenter",
@@ -70,7 +71,6 @@ members = [
     "utils/fixed_decimal",
     "utils/ixdtf",
     "utils/litemap",
-    "utils/pattern",
     "utils/preferences",
     "utils/resb",
     "utils/env_preferences",
@@ -147,6 +147,7 @@ icu_experimental = { version = "~0.1.0", path = "components/experimental", defau
 icu_list = { version = "~1.5.0", path = "components/list", default-features = false }
 icu_locale = { version = "~1.5.0", path = "components/locale", default-features = false }
 icu_normalizer = { version = "~1.5.0", path = "components/normalizer", default-features = false }
+icu_pattern = { version = "0.2.0", path = "components/pattern", default-features = false }
 icu_plurals = { version = "~1.5.0", path = "components/plurals", default-features = false }
 icu_properties = { version = "~1.5.0", path = "components/properties", default-features = false }
 icu_segmenter = { version = "~1.5.0", path = "components/segmenter", default-features = false }
@@ -191,7 +192,6 @@ databake = { version = "0.1.8", path = "utils/databake", default-features = fals
 databake-derive = { version = "0.1.8", path = "utils/databake/derive", default-features = false }
 deduplicating_array = { version = "0.1.6", path = "utils/deduplicating_array", default-features = false }
 fixed_decimal = { version = "0.5.6", path = "utils/fixed_decimal", default-features = false }
-icu_pattern = { version = "0.2.0", path = "utils/pattern", default-features = false }
 ixdtf = { version = "0.2.0", path = "utils/ixdtf", default-features = false }
 litemap = { version = "0.7.3", path = "utils/litemap", default-features = false }
 tinystr = { version = "0.7.5", path = "utils/tinystr", default-features = false }

diff --git a/components/icu/Cargo.toml b/components/icu/Cargo.toml
@@ -34,6 +34,7 @@ icu_properties = { workspace = true }
 icu_segmenter = { workspace = true }
 icu_timezone = { workspace = true }
 icu_experimental = { workspace = true, optional = true }
+icu_pattern = { workspace = true, optional = true }
 
 # For markers_from_bin
 icu_provider_registry = { workspace = true, optional = true }
@@ -63,6 +64,7 @@ default = [
     "icu_segmenter/default",
     "icu_timezone/default",
     "icu_experimental?/default",
+    "icu_pattern?/default",
 ]
 std = [
     "icu_calendar/std",
@@ -79,6 +81,7 @@ std = [
     "icu_segmenter/std",
     "icu_timezone/std",
     "icu_experimental?/std",
+    "icu_pattern?/std",
 ]
 serde = [
     "icu_calendar/serde",
@@ -95,6 +98,7 @@ serde = [
     "icu_segmenter/serde",
     "icu_timezone/serde",
     "icu_experimental?/serde",
+    "icu_pattern?/serde",
 ]
 compiled_data = [
     "icu_calendar/compiled_data",
@@ -142,6 +146,7 @@ experimental = [
     "icu_datetime_experimental",
     "icu_plurals_experimental",
     "dep:icu_experimental",
+    "dep:icu_pattern",
 ]
 sync = ["icu_provider/sync"]
 logging = ["icu_provider/logging", "icu_datetime/logging"]

diff --git a/components/icu/src/lib.rs b/components/icu/src/lib.rs
@@ -191,6 +191,10 @@ pub use icu_timezone as timezone;
 #[cfg(feature = "experimental")]
 pub use icu_experimental as experimental;
 
+#[doc(inline)]
+#[cfg(feature = "experimental")]
+pub use icu_pattern as pattern;
+
 #[cfg(feature = "datagen")]
 mod datagen;
 #[cfg(feature = "datagen")]

diff --git a/utils/pattern/Cargo.toml → components/pattern/Cargo.toml b/utils/pattern/Cargo.toml → components/pattern/Cargo.toml
@@ -38,6 +38,7 @@ serde_json = { workspace = true }
 postcard = { workspace = true, features = ["use-std"] }
 
 [features]
+default = []
 alloc = []
 std = ["alloc"]
 databake = ["dep:databake"]

diff --git a/utils/pattern/LICENSE → components/pattern/LICENSE b/utils/pattern/LICENSE → components/pattern/LICENSE
diff --git a/utils/pattern/README.md → components/pattern/README.md b/utils/pattern/README.md → components/pattern/README.md
diff --git a/utils/pattern/src/builder.rs → components/pattern/src/builder.rs b/utils/pattern/src/builder.rs → components/pattern/src/builder.rs
diff --git a/utils/pattern/src/common.rs → components/pattern/src/common.rs b/utils/pattern/src/common.rs → components/pattern/src/common.rs
diff --git a/utils/pattern/src/double.rs → components/pattern/src/double.rs b/utils/pattern/src/double.rs → components/pattern/src/double.rs
diff --git a/utils/pattern/src/error.rs → components/pattern/src/error.rs b/utils/pattern/src/error.rs → components/pattern/src/error.rs
diff --git a/utils/pattern/src/frontend/databake.rs → components/pattern/src/frontend/databake.rs b/utils/pattern/src/frontend/databake.rs → components/pattern/src/frontend/databake.rs
diff --git a/utils/pattern/src/frontend/mod.rs → components/pattern/src/frontend/mod.rs b/utils/pattern/src/frontend/mod.rs → components/pattern/src/frontend/mod.rs
diff --git a/utils/pattern/src/frontend/serde.rs → components/pattern/src/frontend/serde.rs b/utils/pattern/src/frontend/serde.rs → components/pattern/src/frontend/serde.rs
diff --git a/utils/pattern/src/implementations.rs → components/pattern/src/implementations.rs b/utils/pattern/src/implementations.rs → components/pattern/src/implementations.rs
diff --git a/utils/pattern/src/lib.rs → components/pattern/src/lib.rs b/utils/pattern/src/lib.rs → components/pattern/src/lib.rs
diff --git a/utils/pattern/src/multi_named.rs → components/pattern/src/multi_named.rs b/utils/pattern/src/multi_named.rs → components/pattern/src/multi_named.rs
diff --git a/utils/pattern/src/parser/error.rs → components/pattern/src/parser/error.rs b/utils/pattern/src/parser/error.rs → components/pattern/src/parser/error.rs
diff --git a/utils/pattern/src/parser/mod.rs → components/pattern/src/parser/mod.rs b/utils/pattern/src/parser/mod.rs → components/pattern/src/parser/mod.rs
diff --git a/utils/pattern/src/parser/token.rs → components/pattern/src/parser/token.rs b/utils/pattern/src/parser/token.rs → components/pattern/src/parser/token.rs
diff --git a/utils/pattern/src/single.rs → components/pattern/src/single.rs b/utils/pattern/src/single.rs → components/pattern/src/single.rs
diff --git a/utils/pattern/tests/derive_test.rs → components/pattern/tests/derive_test.rs b/utils/pattern/tests/derive_test.rs → components/pattern/tests/derive_test.rs
diff --git a/ffi/capi/tests/missing_apis.txt b/ffi/capi/tests/missing_apis.txt
@@ -39,6 +39,47 @@ icu::normalizer::uts46::Uts46MapperBorrowed#Struct
 icu::normalizer::uts46::Uts46MapperBorrowed::map_normalize#FnInStruct
 icu::normalizer::uts46::Uts46MapperBorrowed::new#FnInStruct
 icu::normalizer::uts46::Uts46MapperBorrowed::normalize_validate#FnInStruct
+icu::pattern::DoublePlaceholder#Enum
+icu::pattern::DoublePlaceholderKey#Enum
+icu::pattern::DoublePlaceholderKey::from_str#FnInEnum
+icu::pattern::DoublePlaceholderKey::value_for#FnInEnum
+icu::pattern::DoublePlaceholderPattern#Typedef
+icu::pattern::Error#Enum
+icu::pattern::MissingNamedPlaceholderError#Struct
+icu::pattern::MissingNamedPlaceholderError::write_to#FnInStruct
+icu::pattern::MultiNamedPlaceholder#Enum
+icu::pattern::MultiNamedPlaceholderKey#Struct
+icu::pattern::MultiNamedPlaceholderKey::value_for#FnInStruct
+icu::pattern::MultiNamedPlaceholderPattern#Typedef
+icu::pattern::PATTERN_LITERAL_PART#Constant
+icu::pattern::PATTERN_PLACEHOLDER_PART#Constant
+icu::pattern::ParsedPatternItem#Enum
+icu::pattern::Parser#Struct
+icu::pattern::Parser::new#FnInStruct
+icu::pattern::Parser::next#FnInStruct
+icu::pattern::Parser::try_collect_into_vec#FnInStruct
+icu::pattern::Parser::try_next#FnInStruct
+icu::pattern::ParserError#Enum
+icu::pattern::ParserOptions#Struct
+icu::pattern::Pattern#Struct
+icu::pattern::Pattern::interpolate#FnInStruct
+icu::pattern::Pattern::interpolate_to_string#FnInStruct
+icu::pattern::Pattern::iter#FnInStruct
+icu::pattern::Pattern::try_from_items#FnInStruct
+icu::pattern::Pattern::try_from_str#FnInStruct
+icu::pattern::Pattern::try_interpolate#FnInStruct
+icu::pattern::Pattern::try_interpolate_to_string#FnInStruct
+icu::pattern::PatternError#Enum
+icu::pattern::PatternItem#Enum
+icu::pattern::PatternItemCow#Enum
+icu::pattern::PatternString#Struct
+icu::pattern::PlaceholderValueProvider::value_for#FnInTrait
+icu::pattern::QuoteMode#Enum
+icu::pattern::SinglePlaceholder#Enum
+icu::pattern::SinglePlaceholderKey#Enum
+icu::pattern::SinglePlaceholderKey::from_str#FnInEnum
+icu::pattern::SinglePlaceholderKey::value_for#FnInEnum
+icu::pattern::SinglePlaceholderPattern#Typedef
 icu::plurals::PluralElements#Struct
 icu::plurals::PluralElements::as_ref#FnInStruct
 icu::plurals::PluralElements::explicit_one#FnInStruct

diff --git a/tutorials/.cargo/config.toml b/tutorials/.cargo/config.toml
@@ -26,6 +26,7 @@ icu_experimental = { path = "../components/experimental" }
 icu_list = { path = "../components/list" }
 icu_locale = { path = "../components/locale" }
 icu_normalizer = { path = "../components/normalizer" }
+icu_pattern = { path = "../components/pattern" }
 icu_plurals = { path = "../components/plurals" }
 icu_properties = { path = "../components/properties" }
 icu_segmenter = { path = "../components/segmenter" }
@@ -69,7 +70,6 @@ databake = { path = "../utils/databake" }
 databake-derive = { path = "../utils/databake/derive" }
 deduplicating_array = { path = "../utils/deduplicating_array" }
 fixed_decimal = { path = "../utils/fixed_decimal" }
-icu_pattern = { path = "../utils/pattern" }
 ixdtf = { path = "../utils/ixdtf" }
 litemap = { path = "../utils/litemap" }
 tinystr = { path = "../utils/tinystr" }