diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ba38d5cbf..c3093bf3df8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Note: A subset of crates received patch releases in the 1.2 stream. +- `icu_capi` + - Fixed [#3344](https://github.com/unicode-org/icu4x/pull/3344), `buffer_provider` feature accidentally pulling in extra crates - `icu_datagen` - Fixed [#3339](https://github.com/unicode-org/icu4x/pull/3339), incorrect Cargo features - `icu_locid_transform` diff --git a/Cargo.lock b/Cargo.lock index 6895333c0b5..1f39f3bf497 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1584,7 +1584,7 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.2.0" +version = "1.2.1" dependencies = [ "diplomat", "diplomat-runtime", diff --git a/ffi/diplomat/Cargo.toml b/ffi/diplomat/Cargo.toml index 168804b6a87..2dd6ef3f710 100644 --- a/ffi/diplomat/Cargo.toml +++ b/ffi/diplomat/Cargo.toml @@ -5,7 +5,7 @@ [package] name = "icu_capi" description = "C interface to ICU4X" -version = "1.2.0" +version = "1.2.1" authors = ["The ICU4X Project Developers"] edition = "2021" resolver = "2" @@ -41,20 +41,22 @@ any_provider = [] buffer_provider = [ "dep:icu_provider_blob", "dep:serde", - "icu_collator/serde", - "icu_datetime/serde", - "icu_decimal/serde", - "icu_displaynames/serde", - "icu_list/serde", - "icu_locid_transform/serde", + "icu_calendar?/serde", + "icu_collator?/serde", + "icu_datetime?/serde", + "icu_decimal?/serde", + "icu_displaynames?/serde", + "icu_list?/serde", + "icu_locid_transform?/serde", "icu_locid/serde", - "icu_normalizer/serde", - "icu_plurals/serde", - "icu_properties/serde", + "icu_normalizer?/serde", + "icu_plurals?/serde", + "icu_properties?/serde", "icu_provider/serde", "icu_provider_adapters/serde", - "icu_segmenter/serde", + "icu_segmenter?/serde", "icu_testdata?/buffer", + "icu_timezone?/serde", ] provider_fs = ["dep:icu_provider_fs", "buffer_provider"] provider_test = ["dep:icu_testdata"] @@ -70,9 +72,11 @@ wasm_default = ["buffer_provider", "logging"] # Components default_components = ["icu_calendar", "icu_collator", "icu_datetime", "icu_decimal", - "icu_displaynames", "icu_list", "icu_locid_transform", + "icu_list", "icu_locid_transform", "icu_normalizer", "icu_plurals", "icu_properties", "icu_segmenter", "icu_timezone"] +# icu_displaynames is experimental, not included by default + icu_calendar = ["dep:icu_calendar"] icu_collator = ["dep:icu_collator"] # icu_collections = ["dep:icu_collections"] # Not useful on its own diff --git a/ffi/gn/Cargo.lock b/ffi/gn/Cargo.lock index 1d10e0b1d36..047e0795b11 100644 --- a/ffi/gn/Cargo.lock +++ b/ffi/gn/Cargo.lock @@ -252,7 +252,7 @@ dependencies = [ [[package]] name = "icu_capi" -version = "1.2.0" +version = "1.2.1" dependencies = [ "diplomat", "diplomat-runtime", @@ -262,7 +262,6 @@ dependencies = [ "icu_collections", "icu_datetime", "icu_decimal", - "icu_displaynames", "icu_list", "icu_locid", "icu_locid_transform", @@ -345,17 +344,6 @@ dependencies = [ "writeable", ] -[[package]] -name = "icu_displaynames" -version = "0.10.0" -dependencies = [ - "icu_collections", - "icu_locid", - "icu_provider", - "tinystr", - "zerovec", -] - [[package]] name = "icu_list" version = "1.2.0" diff --git a/ffi/gn/icu4x/BUILD.gn b/ffi/gn/icu4x/BUILD.gn index 452183f9836..6221a0d486b 100644 --- a/ffi/gn/icu4x/BUILD.gn +++ b/ffi/gn/icu4x/BUILD.gn @@ -9,7 +9,7 @@ group("icu") { } group("icu_capi") { - public_deps = [ ":icu_capi-v1_2_0" ] + public_deps = [ ":icu_capi-v1_2_1" ] } group("icu_provider") { @@ -227,10 +227,10 @@ rust_library("icu_calendar-v1_2_0") { visibility = [ ":*" ] } -rust_library("icu_capi-v1_2_0") { +rust_library("icu_capi-v1_2_1") { crate_name = "icu_capi" crate_root = "//ffi/diplomat/src/lib.rs" - output_name = "icu_capi-b51c929cdeb02cfc" + output_name = "icu_capi-21b7630bfb7b7ffe" deps = [] deps += [ ":diplomat-v0_5_1($host_toolchain)" ] @@ -241,7 +241,6 @@ rust_library("icu_capi-v1_2_0") { deps += [ ":icu_collections-v1_2_0" ] deps += [ ":icu_datetime-v1_2_0" ] deps += [ ":icu_decimal-v1_2_0" ] - deps += [ ":icu_displaynames-v0_10_0" ] deps += [ ":icu_list-v1_2_0" ] deps += [ ":icu_locid-v1_2_0" ] deps += [ ":icu_locid_transform-v1_2_1" ] @@ -265,15 +264,14 @@ rust_library("icu_capi-v1_2_0") { rustflags = [ "--cap-lints=allow", "--edition=2021", - "-Cmetadata=b51c929cdeb02cfc", - "-Cextra-filename=-b51c929cdeb02cfc", + "-Cmetadata=21b7630bfb7b7ffe", + "-Cextra-filename=-21b7630bfb7b7ffe", "--cfg=feature=\"any_provider\"", "--cfg=feature=\"default_components\"", "--cfg=feature=\"icu_calendar\"", "--cfg=feature=\"icu_collator\"", "--cfg=feature=\"icu_datetime\"", "--cfg=feature=\"icu_decimal\"", - "--cfg=feature=\"icu_displaynames\"", "--cfg=feature=\"icu_list\"", "--cfg=feature=\"icu_locid_transform\"", "--cfg=feature=\"icu_normalizer\"", @@ -395,30 +393,6 @@ rust_library("icu_decimal-v1_2_0") { visibility = [ ":*" ] } -rust_library("icu_displaynames-v0_10_0") { - crate_name = "icu_displaynames" - crate_root = "//experimental/displaynames/src/lib.rs" - output_name = "icu_displaynames-5a5f8e0b4a99042f" - - deps = [] - deps += [ ":icu_collections-v1_2_0" ] - deps += [ ":icu_locid-v1_2_0" ] - deps += [ ":icu_provider-v1_2_0" ] - deps += [ ":tinystr-v0_7_1" ] - deps += [ ":zerovec-v0_9_4" ] - - rustenv = [] - - rustflags = [ - "--cap-lints=allow", - "--edition=2021", - "-Cmetadata=5a5f8e0b4a99042f", - "-Cextra-filename=-5a5f8e0b4a99042f", - ] - - visibility = [ ":*" ] -} - rust_library("icu_list-v1_2_0") { crate_name = "icu_list" crate_root = "//components/list/src/lib.rs"