diff --git a/Cargo.lock b/Cargo.lock index 24e76a10a09..f00a5e5986e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -898,7 +898,7 @@ dependencies = [ "icu_provider", "icu_provider_adapters", "icu_provider_blob", - "icu_registry", + "icu_provider_registry", "icu_segmenter", "icu_timezone", "memchr", @@ -915,8 +915,8 @@ dependencies = [ "icu_provider", "icu_provider_blob", "icu_provider_export", + "icu_provider_registry", "icu_provider_source", - "icu_registry", "log", "simple_logger", ] @@ -1480,7 +1480,7 @@ dependencies = [ "heck 0.5.0", "icu_provider", "icu_provider_export", - "icu_registry", + "icu_provider_registry", "log", "proc-macro2", "writeable", @@ -1557,6 +1557,14 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "icu_provider_registry" +version = "1.5.0" +dependencies = [ + "icu", + "icu_provider", +] + [[package]] name = "icu_provider_source" version = "1.5.0" @@ -1573,7 +1581,7 @@ dependencies = [ "icu_provider", "icu_provider_adapters", "icu_provider_export", - "icu_registry", + "icu_provider_registry", "icu_segmenter", "itertools", "litemap", @@ -1597,14 +1605,6 @@ dependencies = [ "zip", ] -[[package]] -name = "icu_registry" -version = "1.5.0" -dependencies = [ - "icu", - "icu_provider", -] - [[package]] name = "icu_segmenter" version = "1.5.0" diff --git a/Cargo.toml b/Cargo.toml index a97097bb1b4..6115ca872c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -159,7 +159,7 @@ icu_provider_adapters = { version = "~1.5.0", path = "provider/adapters", defaul icu_provider_baked = { version = "~1.5.0", path = "provider/baked", default-features = false } icu_provider_blob = { version = "~1.5.0", path = "provider/blob", default-features = false } icu_provider_fs = { version = "~1.5.0", path = "provider/fs/", default-features = false } -icu_registry = { version = "~1.5.0", path = "provider/registry/", default-features = false } +icu_provider_registry = { version = "~1.5.0", path = "provider/registry/", default-features = false } # Baked data icu_calendar_data = { version = "~1.5.0", path = "provider/data/calendar", default-features = false } diff --git a/components/icu/Cargo.toml b/components/icu/Cargo.toml index c2ac1e941f6..d216551ffec 100644 --- a/components/icu/Cargo.toml +++ b/components/icu/Cargo.toml @@ -36,7 +36,7 @@ icu_timezone = { workspace = true } icu_experimental = { workspace = true, optional = true } # For markers_from_bin -icu_registry = { workspace = true, optional = true } +icu_provider_registry = { workspace = true, optional = true } memchr = { workspace = true, optional = true } # For docs links and features @@ -113,7 +113,7 @@ compiled_data = [ ] datagen = [ "std", - "dep:icu_registry", + "dep:icu_provider_registry", "dep:memchr", "icu_calendar/datagen", "icu_casemap/datagen", diff --git a/components/icu/src/datagen.rs b/components/icu/src/datagen.rs index fb6b2d3b4ea..e27d9f03090 100644 --- a/components/icu/src/datagen.rs +++ b/components/icu/src/datagen.rs @@ -58,7 +58,7 @@ macro_rules! cb { } } } -icu_registry::registry!(cb); +icu_provider_registry::registry!(cb); /// Parses a compiled binary and returns a list of [`DataMarkerInfo`]s that it uses *at runtime*. /// diff --git a/provider/baked/Cargo.toml b/provider/baked/Cargo.toml index 982867fca49..55d24793aa7 100644 --- a/provider/baked/Cargo.toml +++ b/provider/baked/Cargo.toml @@ -22,7 +22,7 @@ zerotrie = { workspace = true, features = ["alloc"] } crlify = { workspace = true, optional = true } databake = { workspace = true, optional = true} -icu_registry = { workspace = true, optional = true } +icu_provider_registry = { workspace = true, optional = true } log = { workspace = true, optional = true } proc-macro2 = { workspace = true, optional = true } heck = { workspace = true, optional = true } @@ -36,7 +36,7 @@ export = [ "dep:crlify", "dep:databake", "dep:heck", - "dep:icu_registry", + "dep:icu_provider_registry", "dep:log", "dep:proc-macro2", "icu_provider/export", diff --git a/provider/baked/src/export.rs b/provider/baked/src/export.rs index e2aac6caeb7..c4ec7a0b888 100644 --- a/provider/baked/src/export.rs +++ b/provider/baked/src/export.rs @@ -744,4 +744,4 @@ macro_rules! cb { } } } -icu_registry::registry!(cb); +icu_provider_registry::registry!(cb); diff --git a/provider/icu4x-datagen/Cargo.toml b/provider/icu4x-datagen/Cargo.toml index aa10e3008a0..9172de2a53e 100644 --- a/provider/icu4x-datagen/Cargo.toml +++ b/provider/icu4x-datagen/Cargo.toml @@ -21,7 +21,7 @@ icu_provider = { workspace = true } icu = { workspace = true, features = ["datagen"] } icu_provider_export = { workspace = true, features = ["rayon"] } icu_provider_source = { workspace = true, optional = true } -icu_registry = { workspace = true } +icu_provider_registry = { workspace = true } icu_provider_blob = { workspace = true, features = ["export"], optional = true } diff --git a/provider/icu4x-datagen/src/main.rs b/provider/icu4x-datagen/src/main.rs index 5e491b51749..13b93c6d4a4 100644 --- a/provider/icu4x-datagen/src/main.rs +++ b/provider/icu4x-datagen/src/main.rs @@ -644,7 +644,7 @@ macro_rules! cb { ); } } -icu_registry::registry!(cb); +icu_provider_registry::registry!(cb); #[cfg(feature = "blob_input")] use icu_provider::buf::DeserializingBufferProvider; diff --git a/provider/registry/Cargo.toml b/provider/registry/Cargo.toml index c5bc80ee25f..0f967c1978f 100644 --- a/provider/registry/Cargo.toml +++ b/provider/registry/Cargo.toml @@ -3,7 +3,7 @@ # (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). [package] -name = "icu_registry" +name = "icu_provider_registry" version.workspace = true rust-version.workspace = true authors.workspace = true diff --git a/provider/registry/README.md b/provider/registry/README.md index c2aff4c1f99..1aa8c5a6241 100644 --- a/provider/registry/README.md +++ b/provider/registry/README.md @@ -1,4 +1,4 @@ -# icu_registry [![crates.io](https://img.shields.io/crates/v/icu_registry)](https://crates.io/crates/icu_registry) +# icu_provider_registry [![crates.io](https://img.shields.io/crates/v/icu_provider_registry)](https://crates.io/crates/icu_provider_registry) diff --git a/provider/source/Cargo.toml b/provider/source/Cargo.toml index 4f6b6059bab..9a33fd75dda 100644 --- a/provider/source/Cargo.toml +++ b/provider/source/Cargo.toml @@ -41,7 +41,7 @@ icu_collections = { workspace = true, features = ["serde"] } icu_pattern = { workspace = true, features = ["alloc"] } icu_provider = { workspace = true, features = ["std", "logging", "export"]} icu_provider_adapters = { workspace = true } -icu_registry = { workspace = true } +icu_provider_registry = { workspace = true } litemap = { workspace = true, features = ["serde"] } tinystr = { workspace = true, features = ["alloc", "serde", "zerovec"] } writeable = { workspace = true } diff --git a/provider/source/src/lib.rs b/provider/source/src/lib.rs index 1fabbdb0684..5d0b8dda2d0 100644 --- a/provider/source/src/lib.rs +++ b/provider/source/src/lib.rs @@ -103,7 +103,7 @@ macro_rules! cb { ], icu_provider::any::AnyMarker); } } -icu_registry::registry!(cb); +icu_provider_registry::registry!(cb); icu_provider::marker::impl_data_provider_never_marker!(SourceDataProvider); diff --git a/provider/source/src/tests/make_testdata.rs b/provider/source/src/tests/make_testdata.rs index aeab386a164..786f05a1eb6 100644 --- a/provider/source/src/tests/make_testdata.rs +++ b/provider/source/src/tests/make_testdata.rs @@ -143,7 +143,7 @@ impl DataExporter for ZeroCopyCheckExporter { }; } } - icu_registry::registry!(cb); + icu_provider_registry::registry!(cb); if payload_before != &payload_after { self.rountrip_errors.lock().expect("poison").insert(( diff --git a/tools/depcheck/src/allowlist.rs b/tools/depcheck/src/allowlist.rs index bc13e18942a..f62fc167086 100644 --- a/tools/depcheck/src/allowlist.rs +++ b/tools/depcheck/src/allowlist.rs @@ -165,7 +165,7 @@ pub const EXTRA_DATAGEN_BIKESHED_DEPS: &[&str] = &[ "icu_pattern", "icu_provider_adapters", "icu_provider_baked", - "icu_registry", + "icu_provider_registry", "itertools", "itoa", "matrixmultiply", @@ -190,7 +190,7 @@ pub const EXTRA_DATAGEN_DEPS: &[&str] = &[ "databake", "databake-derive", "erased-serde", - "icu_registry", + "icu_provider_registry", "postcard", ]; diff --git a/tutorials/.cargo/config.toml b/tutorials/.cargo/config.toml index 4df706fe330..27001c12583 100644 --- a/tutorials/.cargo/config.toml +++ b/tutorials/.cargo/config.toml @@ -43,7 +43,7 @@ icu_provider_adapters = { path = "../provider/adapters" } icu_provider_baked = { path = "../provider/baked" } icu_provider_blob = { path = "../provider/blob" } icu_provider_fs = { path = "../provider/fs/" } -icu_registry = { path = "../provider/registry/" } +icu_provider_registry = { path = "../provider/registry/" } icu4x-datagen = { path = "../provider/icu4x-datagen/" } # Baked data