diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9671841fb2e..5dbdf069b48 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -630,7 +630,7 @@ jobs: - components/locid - components/plurals - components/datetime - - utils/uniset + - components/collections - utils/fixed_decimal @@ -752,7 +752,7 @@ jobs: icu_locid/filter_langids icu_plurals/unread_emails icu_plurals/elevator_floors - icu_uniset/unicode_bmp_blocks_selector + icu_collections/unicode_bmp_blocks_selector fixed_decimal/permyriad writeable/writeable_message litemap/language_names_lite_map diff --git a/Cargo.lock b/Cargo.lock index 53f7e5de8b9..82963996da3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1302,7 +1302,6 @@ dependencies = [ "icu_segmenter", "icu_testdata", "icu_timezone", - "icu_uniset", ] [[package]] @@ -1403,7 +1402,6 @@ dependencies = [ "icu_collections", "icu_locid", "icu_provider", - "icu_uniset", "serde", "yoke", "zerovec", @@ -1446,7 +1444,6 @@ dependencies = [ "icu_properties", "icu_provider", "icu_testdata", - "icu_uniset", "serde", "smallvec", "utf16_iter", @@ -1464,9 +1461,10 @@ dependencies = [ "displaydoc", "iai", "icu", - "icu_uniset", + "icu_benchmark_macros", "postcard", "serde", + "serde_json", "toml", "yoke", "zerofrom", @@ -1506,7 +1504,6 @@ dependencies = [ "icu_segmenter", "icu_testdata", "icu_timezone", - "icu_uniset", "itertools", "lazy_static", "log", @@ -1656,7 +1653,6 @@ dependencies = [ "icu_properties", "icu_provider", "icu_testdata", - "icu_uniset", "serde", "smallvec", "utf16_iter", @@ -1703,7 +1699,6 @@ dependencies = [ "icu_collections", "icu_provider", "icu_testdata", - "icu_uniset", "serde", "unicode-bidi", "zerovec", @@ -1843,7 +1838,6 @@ dependencies = [ "icu_provider_fs", "icu_segmenter", "icu_timezone", - "icu_uniset", "litemap", "log", "reqwest", @@ -1873,23 +1867,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_uniset" -version = "0.5.0" -dependencies = [ - "criterion", - "databake", - "displaydoc", - "icu_benchmark_macros", - "postcard", - "serde", - "serde_json", - "tinystr 0.6.0", - "yoke", - "zerofrom", - "zerovec", -] - [[package]] name = "ident_case" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 9d554c7a44c..4736c8c63fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,6 @@ members = [ "utils/pattern", "utils/tinystr", "utils/tzif", - "utils/uniset", "utils/writeable", "utils/yoke", "utils/yoke/derive", diff --git a/README.md b/README.md index da16c66a415..000d6c6bd61 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ ICU4X will provide an ECMA-402-compatible API surface in the target client-side The [performance benchmarks](docs/process/benchmarking.md) are all run on Ubuntu, and are broken out by component. * [locid](https://unicode-org.github.io/icu4x-docs/benchmarks/perf/components/locid) -* [uniset](https://unicode-org.github.io/icu4x-docs/benchmarks/perf/utils/uniset) +* [collections](https://unicode-org.github.io/icu4x-docs/benchmarks/perf/components/collections) * [fixed_decimal](https://unicode-org.github.io/icu4x-docs/benchmarks/perf/utils/fixed_decimal) * [plurals](https://unicode-org.github.io/icu4x-docs/benchmarks/perf/components/plurals) * [datetime](https://unicode-org.github.io/icu4x-docs/benchmarks/perf/components/datetime) diff --git a/components/collator/Cargo.toml b/components/collator/Cargo.toml index e0e95bb78b4..c1150f35234 100644 --- a/components/collator/Cargo.toml +++ b/components/collator/Cargo.toml @@ -40,7 +40,6 @@ icu_provider = { version = "0.6", path = "../../provider/core", features = ["mac icu_locid = { version = "0.6", path = "../../components/locid" } icu_normalizer = { version = "0.6", path = "../../components/normalizer" } icu_properties = { version = "0.6", path = "../../components/properties" } -icu_uniset = { version = "0.5", path = "../../utils/uniset" } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } zerovec = { version = "0.7", path = "../../utils/zerovec", features = ["serde"] } utf8_iter = "1.0" @@ -59,5 +58,5 @@ bench = false # This option is required for Benchmark CI [features] default = [] -serde = ["dep:serde", "zerovec/serde", "icu_char16trie/serde", "icu_properties/serde", "icu_normalizer/serde", "icu_uniset/serde", "icu_collections/serde", "icu_provider/serde"] -datagen = ["serde", "databake", "zerovec/databake", "icu_char16trie/databake", "icu_properties/databake", "icu_normalizer/databake", "icu_uniset/databake", "icu_collections/databake"] +serde = ["dep:serde", "zerovec/serde", "icu_char16trie/serde", "icu_properties/serde", "icu_normalizer/serde", "icu_collections/serde", "icu_provider/serde"] +datagen = ["serde", "databake", "zerovec/databake", "icu_char16trie/databake", "icu_properties/databake", "icu_normalizer/databake", "icu_collections/databake"] diff --git a/components/collections/Cargo.toml b/components/collections/Cargo.toml index e86e2a9ecd2..931bfb79e30 100644 --- a/components/collections/Cargo.toml +++ b/components/collections/Cargo.toml @@ -33,7 +33,6 @@ all-features = true [dependencies] displaydoc = { version = "0.2.3", default-features = false } -icu_uniset = { version = "0.5.0", path = "../../utils/uniset" } yoke = { version = "0.6.0", path = "../../utils/yoke", features = ["derive"] } zerofrom = { version = "0.1.0", path = "../../utils/zerofrom", features = ["derive"] } zerovec = { version = "0.7", path = "../../utils/zerovec", features = ["yoke"] } @@ -45,7 +44,9 @@ databake = { version = "0.1.0", path = "../../utils/databake", features = ["deri postcard = { version = "1.0.0-alpha.4", features = ["alloc"] } toml = "0.5" serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" criterion = "0.3.4" +icu_benchmark_macros = { version = "0.6", path = "../../tools/benchmark/macros" } iai = "0.1.1" icu = { path = "../icu", default-features = false } @@ -55,15 +56,26 @@ path = "src/lib.rs" [features] default = [] -serde = ["dep:serde", "zerovec/serde", "icu_uniset/serde"] +serde = ["dep:serde", "zerovec/serde"] bench = [] databake = ["dep:databake", "zerovec/databake"] -# [[bench]] -# name = "codepointtrie" -# harness = false -# -# [[bench]] -# name = "iai_cpt" -# harness = false -# required-features = ["bench"] +[[bench]] +name = "codepointtrie" +harness = false +path = "src/codepointtrie/benches/codepointtrie.rs" + +[[bench]] +name = "iai_cpt" +harness = false +required-features = ["bench"] +path = "src/codepointtrie/benches/iai_cpt.rs" + +[[bench]] +name = "inv_list" +harness = false +path = "src/codepointinvlist/benches/inv_list.rs" + +[[example]] +name = "unicode_bmp_blocks_selector" +path = "src/codepointinvlist/examples/unicode_bmp_blocks_selector.rs" diff --git a/components/collections/README.md b/components/collections/README.md index b1ed3309d7c..8364068bc34 100644 --- a/components/collections/README.md +++ b/components/collections/README.md @@ -5,10 +5,13 @@ Collections of API for use in ICU. This module is published as its own crate ([`icu_collections`](https://docs.rs/icu_collections/latest/icu_collections/)) and as part of the [`icu`](https://docs.rs/icu/latest/icu/) crate. See the latter for more details on the ICU4X project. -ICU4X [`CodePointTrie`](crate::codepointtrie::CodePointTrie) is designed to provide a read-only view of CodePointTrie data that is exported +ICU4X [`CodePointTrie`](crate::codepointtrie::CodePointTrie) provides a read-only view of CodePointTrie data that is exported from ICU4C. Detailed information about the design of the data structure can be found in the documentation for the [`CodePointTrie`](crate::codepointtrie::CodePointTrie) struct. +ICU4X [`CodePointInversionList`](`crate::codepointinvlist::CodePointInversionList`) provides necessary functionality for highly efficient querying of sets of Unicode characters. +It is an implementation of the existing [ICU4C UnicodeSet API](https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1UnicodeSet.html). + ## More Information diff --git a/utils/uniset/LICENSE b/components/collections/src/codepointinvlist/LICENSE similarity index 100% rename from utils/uniset/LICENSE rename to components/collections/src/codepointinvlist/LICENSE diff --git a/utils/uniset/README.md b/components/collections/src/codepointinvlist/README.md similarity index 90% rename from utils/uniset/README.md rename to components/collections/src/codepointinvlist/README.md index ea4cf278166..9e353d7e633 100644 --- a/utils/uniset/README.md +++ b/components/collections/src/codepointinvlist/README.md @@ -19,7 +19,7 @@ represented by [inversion lists](http://userguide.icu-project.org/strings/proper the [`CodePointInversionListBuilder`], or from the Properties API. ```rust -use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; +use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; let mut builder = CodePointInversionListBuilder::new(); builder.add_range(&('A'..'Z')); @@ -33,7 +33,7 @@ assert!(set.contains('A')); Currently, you can check if a character/range of characters exists in the [`CodePointInversionList`], or iterate through the characters. ```rust -use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; +use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; let mut builder = CodePointInversionListBuilder::new(); builder.add_range(&('A'..'Z')); diff --git a/utils/uniset/benches/inv_list.rs b/components/collections/src/codepointinvlist/benches/inv_list.rs similarity index 97% rename from utils/uniset/benches/inv_list.rs rename to components/collections/src/codepointinvlist/benches/inv_list.rs index 2b82b73c584..c3c50b93cfa 100644 --- a/utils/uniset/benches/inv_list.rs +++ b/components/collections/src/codepointinvlist/benches/inv_list.rs @@ -3,7 +3,7 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use criterion::{criterion_group, criterion_main, Criterion}; -use icu_uniset::CodePointInversionList; +use icu_collections::codepointinvlist::CodePointInversionList; use std::char; fn uniset_bench(c: &mut Criterion) { diff --git a/utils/uniset/src/builder.rs b/components/collections/src/codepointinvlist/builder.rs similarity index 95% rename from utils/uniset/src/builder.rs rename to components/collections/src/codepointinvlist/builder.rs index 8b524faf130..ce7925b5652 100644 --- a/utils/uniset/src/builder.rs +++ b/components/collections/src/codepointinvlist/builder.rs @@ -6,7 +6,7 @@ use alloc::vec; use alloc::vec::Vec; use core::{char, cmp::Ordering, ops::RangeBounds}; -use crate::{uniset::CodePointInversionList, utils::deconstruct_range}; +use crate::codepointinvlist::{utils::deconstruct_range, CodePointInversionList}; use zerovec::{ule::AsULE, ZeroVec}; /// A builder for [`CodePointInversionList`]. @@ -90,7 +90,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_char('a'); /// let check = builder.build(); @@ -111,7 +111,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_u32(0x41); /// let check = builder.build(); @@ -129,7 +129,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='Z')); /// let check = builder.build(); @@ -145,7 +145,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range_u32(&(0xd800..=0xdfff)); /// let check = builder.build(); @@ -163,7 +163,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; + /// use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; /// let mut builder = CodePointInversionListBuilder::new(); /// let set = CodePointInversionList::from_inversion_list_slice(&[0x41, 0x4C]).unwrap(); /// builder.add_set(&set); @@ -210,7 +210,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='Z')); /// builder.remove_char('A'); @@ -226,7 +226,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='Z')); /// builder.remove_range(&('A'..='C')); @@ -242,7 +242,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; + /// use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; /// let mut builder = CodePointInversionListBuilder::new(); /// let set = CodePointInversionList::from_inversion_list_slice(&[0x41, 0x46]).unwrap(); /// builder.add_range(&('A'..='Z')); @@ -271,7 +271,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='Z')); /// builder.retain_char('A'); @@ -291,7 +291,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='Z')); /// builder.retain_range(&('A'..='B')); @@ -312,7 +312,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; + /// use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; /// let mut builder = CodePointInversionListBuilder::new(); /// let set = CodePointInversionList::from_inversion_list_slice(&[65, 70]).unwrap(); /// builder.add_range(&('A'..='Z')); @@ -379,7 +379,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; + /// use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; /// let mut builder = CodePointInversionListBuilder::new(); /// let set = /// CodePointInversionList::from_inversion_list_slice(&[0x0, 0x41, 0x46, (std::char::MAX as u32) + 1]) @@ -413,7 +413,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='D')); /// builder.complement_char('A'); @@ -434,7 +434,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionListBuilder; + /// use icu_collections::codepointinvlist::CodePointInversionListBuilder; /// let mut builder = CodePointInversionListBuilder::new(); /// builder.add_range(&('A'..='D')); /// builder.complement_range(&('C'..='F')); @@ -454,7 +454,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; + /// use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; /// let mut builder = CodePointInversionListBuilder::new(); /// let set = CodePointInversionList::from_inversion_list_slice(&[0x41, 0x46, 0x4B, 0x5A]).unwrap(); /// builder.add_range(&('C'..='N')); // 67 - 78 @@ -473,7 +473,7 @@ impl CodePointInversionListBuilder { /// # Examples /// /// ``` - /// use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; + /// use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; /// let mut builder = CodePointInversionListBuilder::new(); /// let check = builder.build(); /// assert!(check.is_empty()); diff --git a/utils/uniset/src/conversions.rs b/components/collections/src/codepointinvlist/conversions.rs similarity index 96% rename from utils/uniset/src/conversions.rs rename to components/collections/src/codepointinvlist/conversions.rs index 0c7643ec486..ab0270a0c1a 100644 --- a/utils/uniset/src/conversions.rs +++ b/components/collections/src/codepointinvlist/conversions.rs @@ -10,8 +10,8 @@ use core::{ }; use super::CodePointSetError; -use crate::utils::deconstruct_range; -use crate::{CodePointInversionList, CodePointInversionListBuilder}; +use crate::codepointinvlist::utils::deconstruct_range; +use crate::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; use zerovec::ZeroVec; fn try_from_range<'data, 'r>( @@ -89,7 +89,7 @@ impl FromIterator> for CodePointInversionList<'_> { #[cfg(test)] mod tests { use super::*; - use crate::CodePointInversionList; + use crate::codepointinvlist::CodePointInversionList; use core::{char, convert::TryFrom}; #[test] diff --git a/utils/uniset/src/uniset.rs b/components/collections/src/codepointinvlist/cpinvlist.rs similarity index 95% rename from utils/uniset/src/uniset.rs rename to components/collections/src/codepointinvlist/cpinvlist.rs index ac6deb10073..48b3c762510 100644 --- a/utils/uniset/src/uniset.rs +++ b/components/collections/src/codepointinvlist/cpinvlist.rs @@ -11,7 +11,7 @@ use zerofrom::ZeroFrom; use zerovec::{ule::AsULE, ZeroSlice, ZeroVec}; use super::CodePointSetError; -use crate::utils::{deconstruct_range, is_valid_zv}; +use crate::codepointinvlist::utils::{deconstruct_range, is_valid_zv}; /// Represents the end code point of the Basic Multilingual Plane range, starting from code point 0, inclusive const BMP_MAX: u32 = 0xFFFF; @@ -63,13 +63,13 @@ impl<'de: 'a, 'a> serde::Deserialize<'de> for CodePointInversionList<'a> { #[cfg(feature = "databake")] impl databake::Bake for CodePointInversionList<'_> { fn bake(&self, env: &databake::CrateEnv) -> databake::TokenStream { - env.insert("icu_uniset"); + env.insert("icu_collections"); let inv_list = self.inv_list.bake(env); let size = self.size.bake(env); // Safe because our parts are safe. databake::quote! { unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked(#inv_list, #size) + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked(#inv_list, #size) }} } } @@ -98,8 +98,8 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; - /// use icu_uniset::CodePointSetError; + /// use icu_collections::codepointinvlist::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointSetError; /// use zerovec::ZeroVec; /// let valid = [0x0, 0x10000]; /// let inv_list: ZeroVec = ZeroVec::from_slice_or_alloc(&valid); @@ -147,8 +147,8 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; - /// use icu_uniset::CodePointSetError; + /// use icu_collections::codepointinvlist::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointSetError; /// use zerovec::ZeroVec; /// let valid = [0x0, 0x10000]; /// let result = CodePointInversionList::from_inversion_list_slice(&valid); @@ -175,8 +175,8 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; - /// use icu_uniset::CodePointSetError; + /// use icu_collections::codepointinvlist::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointSetError; /// use zerovec::ZeroVec; /// /// use std::vec::Vec; @@ -219,7 +219,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// use zerovec::ZeroVec; /// /// let expected = vec![0x0, (char::MAX as u32) + 1]; @@ -243,7 +243,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// use zerovec::ZeroVec; /// /// const BMP_MAX: u32 = 0xFFFF; @@ -274,7 +274,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x44, 0x45, 0x46]; /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// let mut ex_iter_chars = example.iter_chars(); @@ -303,7 +303,7 @@ impl<'data> CodePointInversionList<'data> { /// # Example /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x44, 0x45, 0x46]; /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// let mut example_iter_ranges = example.iter_ranges(); @@ -379,7 +379,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x43, 0x44, 0x45]; /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// assert!(example.contains('A')); @@ -402,7 +402,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x43, 0x44, 0x45]; /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// assert!(example.contains_u32(0x41)); @@ -421,7 +421,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x43, 0x44, 0x45]; /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// assert!(example.contains_range(&('A'..'C'))); @@ -440,7 +440,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// use std::char; /// let check = char::from_u32(0xD7FE).unwrap()..char::from_u32(0xE001).unwrap(); /// let example_list = [0xD7FE, 0xD7FF, 0xE000, 0xE001]; @@ -473,7 +473,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x46, 0x55, 0x5B]; // A - E, U - Z /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// let a_to_d = CodePointInversionList::from_inversion_list_slice(&[0x41, 0x45]).unwrap(); @@ -513,7 +513,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x44]; // {A, B, C} /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// assert_eq!(example.span("CABXYZ", true), 3); @@ -534,7 +534,7 @@ impl<'data> CodePointInversionList<'data> { /// # Examples /// /// ``` - /// use icu_uniset::CodePointInversionList; + /// use icu_collections::codepointinvlist::CodePointInversionList; /// let example_list = [0x41, 0x44]; // {A, B, C} /// let example = CodePointInversionList::from_inversion_list_slice(&example_list).unwrap(); /// assert_eq!(example.span_back("XYZCAB", true), 3); @@ -834,7 +834,7 @@ mod tests { CodePointInversionList<'static>, const: unsafe { #[allow(unused_unsafe)] - crate::CodePointInversionList::from_parts_unchecked( + crate::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 48u8, 0u8, 0u8, 0u8, 58u8, 0u8, 0u8, 0u8, 65u8, 0u8, 0u8, 0u8, 71u8, @@ -844,7 +844,7 @@ mod tests { 22usize, ) }, - icu_uniset, + icu_collections, [zerovec], ); } diff --git a/utils/uniset/examples/unicode_bmp_blocks_selector.rs b/components/collections/src/codepointinvlist/examples/unicode_bmp_blocks_selector.rs similarity index 96% rename from utils/uniset/examples/unicode_bmp_blocks_selector.rs rename to components/collections/src/codepointinvlist/examples/unicode_bmp_blocks_selector.rs index 59a5515934d..9c2d4ef2511 100644 --- a/utils/uniset/examples/unicode_bmp_blocks_selector.rs +++ b/components/collections/src/codepointinvlist/examples/unicode_bmp_blocks_selector.rs @@ -16,7 +16,7 @@ icu_benchmark_macros::static_setup!(); -use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; +use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; fn get_basic_latin_block() -> CodePointInversionList<'static> { let mut builder = CodePointInversionListBuilder::new(); diff --git a/utils/uniset/src/lib.rs b/components/collections/src/codepointinvlist/mod.rs similarity index 73% rename from utils/uniset/src/lib.rs rename to components/collections/src/codepointinvlist/mod.rs index 583212c4a04..779224d29f8 100644 --- a/utils/uniset/src/lib.rs +++ b/components/collections/src/codepointinvlist/mod.rs @@ -2,9 +2,7 @@ // called LICENSE at the top level of the ICU4X source tree // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). -//! `icu_uniset` is a utility crate of the [`ICU4X`] project. -//! -//! This API provides necessary functionality for highly efficient querying of sets of Unicode characters. +//! This module provides necessary functionality for highly efficient querying of sets of Unicode characters. //! //! It is an implementation of the existing [ICU4C UnicodeSet API](https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1UnicodeSet.html). //! @@ -21,7 +19,7 @@ //! the [`CodePointInversionListBuilder`], or from the Properties API. //! //! ``` -//! use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; +//! use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; //! //! let mut builder = CodePointInversionListBuilder::new(); //! builder.add_range(&('A'..'Z')); @@ -35,7 +33,7 @@ //! Currently, you can check if a character/range of characters exists in the [`CodePointInversionList`], or iterate through the characters. //! //! ``` -//! use icu_uniset::{CodePointInversionList, CodePointInversionListBuilder}; +//! use icu_collections::codepointinvlist::{CodePointInversionList, CodePointInversionListBuilder}; //! //! let mut builder = CodePointInversionListBuilder::new(); //! builder.add_range(&('A'..'Z')); @@ -48,20 +46,6 @@ //! //! [`ICU4X`]: ../icu/index.html -// https://github.com/unicode-org/icu4x/blob/main/docs/process/boilerplate.md#library-annotations -#![cfg_attr(not(any(test, feature = "std")), no_std)] -#![cfg_attr( - not(test), - deny( - clippy::indexing_slicing, - clippy::unwrap_used, - clippy::expect_used, - clippy::panic, - clippy::exhaustive_structs, - // TODO(#1668): enable clippy::exhaustive_enums, - // TODO(#2266): enable missing_debug_implementations, - ) -)] #![warn(missing_docs)] extern crate alloc; @@ -69,15 +53,15 @@ extern crate alloc; #[macro_use] mod builder; mod conversions; -mod uniset; +mod cpinvlist; mod utils; use alloc::vec::Vec; pub use builder::CodePointInversionListBuilder; pub use conversions::*; +pub use cpinvlist::CodePointInversionList; use displaydoc::Display; -pub use uniset::CodePointInversionList; pub use utils::*; /// Custom Errors for [`CodePointInversionList`]. diff --git a/utils/uniset/src/utils.rs b/components/collections/src/codepointinvlist/utils.rs similarity index 100% rename from utils/uniset/src/utils.rs rename to components/collections/src/codepointinvlist/utils.rs diff --git a/components/collections/src/codepointtrie/cptrie.rs b/components/collections/src/codepointtrie/cptrie.rs index 64fd98dc274..567f054004c 100644 --- a/components/collections/src/codepointtrie/cptrie.rs +++ b/components/collections/src/codepointtrie/cptrie.rs @@ -5,12 +5,12 @@ use crate::codepointtrie::error::Error; use crate::codepointtrie::impl_const::*; +use crate::codepointinvlist::CodePointInversionList; use core::convert::TryFrom; use core::fmt::Display; use core::iter::FromIterator; use core::num::TryFromIntError; use core::ops::RangeInclusive; -use icu_uniset::CodePointInversionList; use yoke::Yokeable; use zerofrom::ZeroFrom; use zerovec::ZeroVec; diff --git a/components/collections/src/lib.rs b/components/collections/src/lib.rs index b1510bd26ab..395562bc93b 100644 --- a/components/collections/src/lib.rs +++ b/components/collections/src/lib.rs @@ -7,10 +7,13 @@ //! This module is published as its own crate ([`icu_collections`](https://docs.rs/icu_collections/latest/icu_collections/)) //! and as part of the [`icu`](https://docs.rs/icu/latest/icu/) crate. See the latter for more details on the ICU4X project. //! -//! ICU4X [`CodePointTrie`](crate::codepointtrie::CodePointTrie) is designed to provide a read-only view of CodePointTrie data that is exported +//! ICU4X [`CodePointTrie`](crate::codepointtrie::CodePointTrie) provides a read-only view of CodePointTrie data that is exported //! from ICU4C. Detailed information about the design of the data structure can be found in the documentation //! for the [`CodePointTrie`](crate::codepointtrie::CodePointTrie) struct. //! +//! ICU4X [`CodePointInversionList`](`crate::codepointinvlist::CodePointInversionList`) provides necessary functionality for highly efficient querying of sets of Unicode characters. +//! It is an implementation of the existing [ICU4C UnicodeSet API](https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classicu_1_1UnicodeSet.html). +//! // https://github.com/unicode-org/icu4x/blob/main/docs/process/boilerplate.md#library-annotations #![cfg_attr(not(any(test, feature = "std")), no_std)] @@ -27,4 +30,5 @@ extern crate alloc; +pub mod codepointinvlist; pub mod codepointtrie; diff --git a/components/icu/Cargo.toml b/components/icu/Cargo.toml index 69f5bae7496..1ea4cf118ce 100644 --- a/components/icu/Cargo.toml +++ b/components/icu/Cargo.toml @@ -44,7 +44,6 @@ icu_segmenter = { version = "0.6", path = "../../experimental/segmenter", defaul [dev-dependencies] icu_testdata = { version = "0.6", path = "../../provider/testdata" } -icu_uniset = { version = "0.5", path = "../../utils/uniset" } [features] default = [] diff --git a/components/icu/examples/tui.rs b/components/icu/examples/tui.rs index 19f6eefd959..f31a8b68f5d 100644 --- a/components/icu/examples/tui.rs +++ b/components/icu/examples/tui.rs @@ -14,7 +14,7 @@ use icu::datetime::{ }; use icu::locid::{locale, Locale}; use icu::plurals::{PluralCategory, PluralRules}; -use icu_uniset::CodePointInversionListBuilder; +use icu_collections::codepointinvlist::CodePointInversionListBuilder; use std::env; fn print>(_input: T) { diff --git a/components/normalizer/Cargo.toml b/components/normalizer/Cargo.toml index 891a692d136..31566389c60 100644 --- a/components/normalizer/Cargo.toml +++ b/components/normalizer/Cargo.toml @@ -38,7 +38,6 @@ icu_collections = { version = "0.6", path = "../../components/collections" } icu_provider = { version = "0.6", path = "../../provider/core", features = ["macros"] } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } zerovec = { version = "0.7", path = "../../utils/zerovec" } -icu_uniset = { version = "0.5", path = "../../utils/uniset" } icu_properties = { version = "0.6", path = "../../components/properties" } utf8_iter = "1.0" utf16_iter = "1.0" @@ -60,6 +59,6 @@ bench = false # This option is required for Benchmark CI [features] default = [] -serde = ["dep:serde", "icu_collections/serde", "zerovec/serde", "icu_uniset/serde", "icu_properties/serde", "icu_char16trie/serde"] -datagen = ["serde", "databake", "icu_collections/databake", "zerovec/databake", "icu_uniset/databake", "icu_properties/databake", "icu_char16trie/databake"] +serde = ["dep:serde", "icu_collections/serde", "zerovec/serde", "icu_properties/serde", "icu_char16trie/serde"] +datagen = ["serde", "databake", "icu_collections/databake", "zerovec/databake", "icu_properties/databake", "icu_char16trie/databake"] experimental = [] diff --git a/components/normalizer/src/tests.rs b/components/normalizer/src/tests.rs index 9de56936e03..3f2a73f0045 100644 --- a/components/normalizer/src/tests.rs +++ b/components/normalizer/src/tests.rs @@ -433,7 +433,7 @@ fn test_conformance() { // Commented out, because we don't currently have a way to force a no-op set for testing. // #[test] // fn test_hangul() { -// use icu_uniset::{CodePointSet, CodePointSetBuilder}; +// use icu_collections::codepointinvlist::{CodePointSet, CodePointSetBuilder}; // use zerofrom::ZeroFrom; // let builder = CodePointSetBuilder::new(); // let set: CodePointSet = builder.build(); diff --git a/components/properties/Cargo.toml b/components/properties/Cargo.toml index 919993fac71..45c094b841b 100644 --- a/components/properties/Cargo.toml +++ b/components/properties/Cargo.toml @@ -35,7 +35,6 @@ all-features = true displaydoc = { version = "0.2.3", default-features = false } icu_collections = { version = "0.6", path = "../../components/collections"} icu_provider = { version = "0.6", path = "../../provider/core", features = ["macros"] } -icu_uniset = { version = "0.5", path = "../../utils/uniset"} serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } zerovec = { version = "0.7", path = "../../utils/zerovec", features = ["derive"] } unicode-bidi = { version = "0.3.8", optional = true, default-features = false } @@ -52,6 +51,6 @@ path = "src/lib.rs" [features] std = ["icu_provider/std"] default = [] -serde = ["dep:serde", "zerovec/serde", "icu_uniset/serde", "icu_collections/serde", "icu_provider/serde"] -datagen = ["serde", "databake", "zerovec/databake", "icu_uniset/databake", "icu_collections/databake"] +serde = ["dep:serde", "zerovec/serde", "icu_collections/serde", "icu_provider/serde"] +datagen = ["serde", "databake", "zerovec/databake", "icu_collections/databake"] bidi = [ "dep:unicode-bidi" ] diff --git a/components/properties/src/provider.rs b/components/properties/src/provider.rs index 7fe8e630dcc..aae849a346d 100644 --- a/components/properties/src/provider.rs +++ b/components/properties/src/provider.rs @@ -11,9 +11,9 @@ use crate::script::ScriptWithExtensions; use core::ops::RangeInclusive; +use icu_collections::codepointinvlist::CodePointInversionList; use icu_collections::codepointtrie::{CodePointMapRange, CodePointTrie, TrieValue}; use icu_provider::prelude::*; -use icu_uniset::CodePointInversionList; use zerofrom::ZeroFrom; /// A set of characters with a particular property. diff --git a/components/properties/src/script.rs b/components/properties/src/script.rs index a8f36bc5e01..31870262b37 100644 --- a/components/properties/src/script.rs +++ b/components/properties/src/script.rs @@ -12,9 +12,9 @@ use crate::provider::*; use crate::props::ScriptULE; use core::iter::FromIterator; use core::ops::RangeInclusive; +use icu_collections::codepointinvlist::CodePointInversionList; use icu_collections::codepointtrie::CodePointTrie; use icu_provider::prelude::*; -use icu_uniset::CodePointInversionList; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; use zerovec::{ule::AsULE, VarZeroVec, ZeroSlice}; diff --git a/components/properties/src/sets.rs b/components/properties/src/sets.rs index 93389605987..ffa1f335a02 100644 --- a/components/properties/src/sets.rs +++ b/components/properties/src/sets.rs @@ -19,8 +19,8 @@ use crate::provider::*; use crate::*; use core::iter::FromIterator; use core::ops::RangeInclusive; +use icu_collections::codepointinvlist::CodePointInversionList; use icu_provider::prelude::*; -use icu_uniset::CodePointInversionList; /// A wrapper around code point set data. It is returned by APIs that return Unicode /// property data in a set-like form, ex: a set of code points sharing the same @@ -1749,7 +1749,7 @@ mod tests { fn test_gc_groupings() { use icu::properties::{maps, sets}; use icu::properties::{GeneralCategory, GeneralCategoryGroup}; - use icu_uniset::CodePointInversionListBuilder; + use icu_collections::codepointinvlist::CodePointInversionListBuilder; let provider = icu_testdata::get_provider(); diff --git a/experimental/casemapping/Cargo.toml b/experimental/casemapping/Cargo.toml index 2c0e857d068..7905a962096 100644 --- a/experimental/casemapping/Cargo.toml +++ b/experimental/casemapping/Cargo.toml @@ -27,7 +27,6 @@ displaydoc = { version = "0.2.3", default-features = false } icu_collections = { version = "0.6", path = "../../components/collections" } icu_locid = { version = "0.6", path = "../../components/locid" } icu_provider = { version = "0.6", path = "../../provider/core", features = ["macros"] } -icu_uniset = { version = "0.5", path = "../../utils/uniset" } yoke = { version = "0.6.0", path = "../../utils/yoke", features = ["derive"] } zerovec = { version = "0.7", path = "../../utils/zerovec", features = ["yoke"] } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } diff --git a/experimental/casemapping/src/internals.rs b/experimental/casemapping/src/internals.rs index 076f0a872df..7f2d41dfddf 100644 --- a/experimental/casemapping/src/internals.rs +++ b/experimental/casemapping/src/internals.rs @@ -4,12 +4,12 @@ use core::convert::TryFrom; use core::num::TryFromIntError; +use icu_collections::codepointinvlist::CodePointInversionListBuilder; #[cfg(feature = "datagen")] use icu_collections::codepointtrie::CodePointTrieHeader; use icu_collections::codepointtrie::{CodePointTrie, TrieValue}; use icu_locid::Locale; use icu_provider::{yoke, zerofrom}; -use icu_uniset::CodePointInversionListBuilder; #[cfg(feature = "datagen")] use std::collections::HashMap; use zerovec::ule::{AsULE, RawBytesULE}; diff --git a/ffi/diplomat/cpp/docs/source/properties_sets_ffi.rst b/ffi/diplomat/cpp/docs/source/properties_sets_ffi.rst index 23b1f0c55f4..14019aafaa0 100644 --- a/ffi/diplomat/cpp/docs/source/properties_sets_ffi.rst +++ b/ffi/diplomat/cpp/docs/source/properties_sets_ffi.rst @@ -19,5 +19,5 @@ Checks whether the code point is in the set. - See the `Rust documentation `__ for more information. + See the `Rust documentation `__ for more information. diff --git a/ffi/diplomat/cpp/include/ICU4XCodePointSetData.hpp b/ffi/diplomat/cpp/include/ICU4XCodePointSetData.hpp index 353435a1e12..ea6977766f8 100644 --- a/ffi/diplomat/cpp/include/ICU4XCodePointSetData.hpp +++ b/ffi/diplomat/cpp/include/ICU4XCodePointSetData.hpp @@ -42,7 +42,7 @@ class ICU4XCodePointSetData { /** * Checks whether the code point is in the set. * - * See the [Rust documentation](https://unicode-org.github.io/icu4x-docs/doc/icu_uniset/struct.CodePointSet.html#method.contains) for more information. + * See the [Rust documentation](https://unicode-org.github.io/icu4x-docs/doc/icu_collections/codepointinvlist/struct.CodePointSet.html#method.contains) for more information. */ bool contains(char32_t cp) const; inline const capi::ICU4XCodePointSetData* AsFFI() const { return this->inner.get(); } diff --git a/ffi/diplomat/src/properties_sets.rs b/ffi/diplomat/src/properties_sets.rs index c7449086c93..ac297559630 100644 --- a/ffi/diplomat/src/properties_sets.rs +++ b/ffi/diplomat/src/properties_sets.rs @@ -31,7 +31,10 @@ pub mod ffi { } /// Checks whether the code point is in the set. - #[diplomat::rust_link(icu_uniset::CodePointSet::contains, FnInStruct)] + #[diplomat::rust_link( + icu_collections::codepointinvlist::CodePointSet::contains, + FnInStruct + )] pub fn contains(&self, cp: char) -> bool { self.0.as_borrowed().contains(cp) } diff --git a/ffi/diplomat/wasm/icu4x/docs/properties_sets_ffi.rst b/ffi/diplomat/wasm/icu4x/docs/properties_sets_ffi.rst index 50ad5db63c8..75010133284 100644 --- a/ffi/diplomat/wasm/icu4x/docs/properties_sets_ffi.rst +++ b/ffi/diplomat/wasm/icu4x/docs/properties_sets_ffi.rst @@ -19,5 +19,5 @@ Checks whether the code point is in the set. - See the `Rust documentation `__ for more information. + See the `Rust documentation `__ for more information. diff --git a/ffi/diplomat/wasm/icu4x/lib/ICU4XCodePointSetData.d.ts b/ffi/diplomat/wasm/icu4x/lib/ICU4XCodePointSetData.d.ts index 5430fefb1a7..de94d418591 100644 --- a/ffi/diplomat/wasm/icu4x/lib/ICU4XCodePointSetData.d.ts +++ b/ffi/diplomat/wasm/icu4x/lib/ICU4XCodePointSetData.d.ts @@ -24,7 +24,7 @@ export class ICU4XCodePointSetData { * Checks whether the code point is in the set. - * See the {@link https://unicode-org.github.io/icu4x-docs/doc/icu_uniset/struct.CodePointSet.html#method.contains Rust documentation} for more information. + * See the {@link https://unicode-org.github.io/icu4x-docs/doc/icu_collections/codepointinvlist/struct.CodePointSet.html#method.contains Rust documentation} for more information. */ contains(cp: char): boolean; } diff --git a/provider/datagen/Cargo.toml b/provider/datagen/Cargo.toml index 062d0cef2a4..7d031d721a0 100644 --- a/provider/datagen/Cargo.toml +++ b/provider/datagen/Cargo.toml @@ -62,7 +62,6 @@ icu_char16trie = { version = "0.1", path = "../../experimental/char16trie", feat icu_collections = { version = "0.6", path = "../../components/collections", features = ["serde"] } icu_codepointtrie_builder = { path = "../../components/collections/codepointtrie_builder" } icu_locid = { version = "0.6", path = "../../components/locid", features = ["std"]} -icu_uniset = { version = "0.5", path = "../../utils/uniset", features = ["serde"] } itertools = "0.10" log = "0.4" rayon = "1.5" diff --git a/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs b/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs index aaf13a5cb7f..f637b9c0752 100644 --- a/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs +++ b/provider/datagen/src/transform/icuexport/uprops/bin_uniset.rs @@ -3,10 +3,10 @@ // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). use crate::SourceData; +use icu_collections::codepointinvlist::CodePointInversionListBuilder; use icu_properties::provider::*; use icu_provider::datagen::*; use icu_provider::prelude::*; -use icu_uniset::CodePointInversionListBuilder; fn get_binary<'a>( source: &'a SourceData, @@ -132,9 +132,9 @@ expand!( #[test] fn test_basic() { + use icu_collections::codepointinvlist::CodePointInversionList; use icu_properties::provider::PropertyCodePointSetV1; use icu_properties::provider::WhiteSpaceV1Marker; - use icu_uniset::CodePointInversionList; let provider = crate::DatagenProvider::for_test(); diff --git a/provider/testdata/Cargo.toml b/provider/testdata/Cargo.toml index 6ed04ec763b..a69de8a46f6 100644 --- a/provider/testdata/Cargo.toml +++ b/provider/testdata/Cargo.toml @@ -316,7 +316,6 @@ icu_segmenter = { version = "0.6", path = "../../experimental/segmenter", option icu_timezone = { version = "0.6", path = "../../components/timezone", optional = true } icu_char16trie = { version = "0.1", path = "../../experimental/char16trie", optional = true } icu_collections = { version = "0.6", path = "../../components/collections", optional = true } -icu_uniset = { version = "0.5", path = "../../utils/uniset", optional = true } litemap = { version = "0.4", path = "../../utils/litemap", optional = true, default-features = false } tinystr = { version = "0.6", path = "../../utils/tinystr", optional = true } zerovec = { version = "0.7", path = "../../utils/zerovec", optional = true } @@ -360,7 +359,6 @@ baked = [ "icu_timezone", "icu_char16trie", "icu_collections", - "icu_uniset", "litemap", "tinystr", "zerovec", diff --git a/provider/testdata/data/baked/props/ahex_v1.rs b/provider/testdata/data/baked/props/ahex_v1.rs index 41b85a6402f..a73ac311ad0 100644 --- a/provider/testdata/data/baked/props/ahex_v1.rs +++ b/provider/testdata/data/baked/props/ahex_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 48u8, 0u8, 0u8, 0u8, 58u8, 0u8, 0u8, 0u8, 65u8, 0u8, 0u8, 0u8, 71u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/alpha_v1.rs b/provider/testdata/data/baked/props/alpha_v1.rs index 5d792b35edd..a83e9b75285 100644 --- a/provider/testdata/data/baked/props/alpha_v1.rs +++ b/provider/testdata/data/baked/props/alpha_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/bidi_c_v1.rs b/provider/testdata/data/baked/props/bidi_c_v1.rs index 7a8ffebe63a..ffba41f65af 100644 --- a/provider/testdata/data/baked/props/bidi_c_v1.rs +++ b/provider/testdata/data/baked/props/bidi_c_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 28u8, 6u8, 0u8, 0u8, 29u8, 6u8, 0u8, 0u8, 14u8, 32u8, 0u8, 0u8, 16u8, 32u8, diff --git a/provider/testdata/data/baked/props/bidi_m_v1.rs b/provider/testdata/data/baked/props/bidi_m_v1.rs index 5b3daac2524..1ca041b6525 100644 --- a/provider/testdata/data/baked/props/bidi_m_v1.rs +++ b/provider/testdata/data/baked/props/bidi_m_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 40u8, 0u8, 0u8, 0u8, 42u8, 0u8, 0u8, 0u8, 60u8, 0u8, 0u8, 0u8, 61u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/cased_v1.rs b/provider/testdata/data/baked/props/cased_v1.rs index 48aad4ffb2f..bbeea4f20da 100644 --- a/provider/testdata/data/baked/props/cased_v1.rs +++ b/provider/testdata/data/baked/props/cased_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/ci_v1.rs b/provider/testdata/data/baked/props/ci_v1.rs index ad2f7a72122..883d8bf4d34 100644 --- a/provider/testdata/data/baked/props/ci_v1.rs +++ b/provider/testdata/data/baked/props/ci_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 39u8, 0u8, 0u8, 0u8, 40u8, 0u8, 0u8, 0u8, 46u8, 0u8, 0u8, 0u8, 47u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/cwcf_v1.rs b/provider/testdata/data/baked/props/cwcf_v1.rs index 0dc2acc1d23..eb1ebfc6c20 100644 --- a/provider/testdata/data/baked/props/cwcf_v1.rs +++ b/provider/testdata/data/baked/props/cwcf_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 181u8, 0u8, 0u8, 0u8, 182u8, 0u8, diff --git a/provider/testdata/data/baked/props/cwkcf_v1.rs b/provider/testdata/data/baked/props/cwkcf_v1.rs index 8868e18f3c6..58e05437354 100644 --- a/provider/testdata/data/baked/props/cwkcf_v1.rs +++ b/provider/testdata/data/baked/props/cwkcf_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 160u8, 0u8, 0u8, 0u8, 161u8, 0u8, diff --git a/provider/testdata/data/baked/props/cwl_v1.rs b/provider/testdata/data/baked/props/cwl_v1.rs index a121ae43b7b..dd17e665d86 100644 --- a/provider/testdata/data/baked/props/cwl_v1.rs +++ b/provider/testdata/data/baked/props/cwl_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 192u8, 0u8, 0u8, 0u8, 215u8, 0u8, diff --git a/provider/testdata/data/baked/props/cwt_v1.rs b/provider/testdata/data/baked/props/cwt_v1.rs index c11e7755d8d..9218db426a2 100644 --- a/provider/testdata/data/baked/props/cwt_v1.rs +++ b/provider/testdata/data/baked/props/cwt_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, 0u8, 181u8, 0u8, 0u8, 0u8, 182u8, 0u8, diff --git a/provider/testdata/data/baked/props/cwu_v1.rs b/provider/testdata/data/baked/props/cwu_v1.rs index 7023fa1ec8c..88ff51fcbe9 100644 --- a/provider/testdata/data/baked/props/cwu_v1.rs +++ b/provider/testdata/data/baked/props/cwu_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, 0u8, 181u8, 0u8, 0u8, 0u8, 182u8, 0u8, diff --git a/provider/testdata/data/baked/props/dash_v1.rs b/provider/testdata/data/baked/props/dash_v1.rs index 354e84f57ca..9cf8a4fdb26 100644 --- a/provider/testdata/data/baked/props/dash_v1.rs +++ b/provider/testdata/data/baked/props/dash_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 45u8, 0u8, 0u8, 0u8, 46u8, 0u8, 0u8, 0u8, 138u8, 5u8, 0u8, 0u8, 139u8, 5u8, diff --git a/provider/testdata/data/baked/props/dep_v1.rs b/provider/testdata/data/baked/props/dep_v1.rs index 2d253b50199..cb0d86b9565 100644 --- a/provider/testdata/data/baked/props/dep_v1.rs +++ b/provider/testdata/data/baked/props/dep_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 73u8, 1u8, 0u8, 0u8, 74u8, 1u8, 0u8, 0u8, 115u8, 6u8, 0u8, 0u8, 116u8, 6u8, diff --git a/provider/testdata/data/baked/props/di_v1.rs b/provider/testdata/data/baked/props/di_v1.rs index dc46b4db91e..6dd48d2657f 100644 --- a/provider/testdata/data/baked/props/di_v1.rs +++ b/provider/testdata/data/baked/props/di_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 173u8, 0u8, 0u8, 0u8, 174u8, 0u8, 0u8, 0u8, 79u8, 3u8, 0u8, 0u8, 80u8, 3u8, diff --git a/provider/testdata/data/baked/props/dia_v1.rs b/provider/testdata/data/baked/props/dia_v1.rs index 757a1321395..f771752d45d 100644 --- a/provider/testdata/data/baked/props/dia_v1.rs +++ b/provider/testdata/data/baked/props/dia_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 94u8, 0u8, 0u8, 0u8, 95u8, 0u8, 0u8, 0u8, 96u8, 0u8, 0u8, 0u8, 97u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/ebase_v1.rs b/provider/testdata/data/baked/props/ebase_v1.rs index 99bcc237b7b..33688f4c70f 100644 --- a/provider/testdata/data/baked/props/ebase_v1.rs +++ b/provider/testdata/data/baked/props/ebase_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 29u8, 38u8, 0u8, 0u8, 30u8, 38u8, 0u8, 0u8, 249u8, 38u8, 0u8, 0u8, 250u8, 38u8, diff --git a/provider/testdata/data/baked/props/ecomp_v1.rs b/provider/testdata/data/baked/props/ecomp_v1.rs index a963fe8721f..72a1433cb5b 100644 --- a/provider/testdata/data/baked/props/ecomp_v1.rs +++ b/provider/testdata/data/baked/props/ecomp_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 35u8, 0u8, 0u8, 0u8, 36u8, 0u8, 0u8, 0u8, 42u8, 0u8, 0u8, 0u8, 43u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/emod_v1.rs b/provider/testdata/data/baked/props/emod_v1.rs index 299d3787548..820804ab21f 100644 --- a/provider/testdata/data/baked/props/emod_v1.rs +++ b/provider/testdata/data/baked/props/emod_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 251u8, 243u8, 1u8, 0u8, 0u8, 244u8, 1u8, 0u8, diff --git a/provider/testdata/data/baked/props/emoji_v1.rs b/provider/testdata/data/baked/props/emoji_v1.rs index c009d952053..d4e8eb959a0 100644 --- a/provider/testdata/data/baked/props/emoji_v1.rs +++ b/provider/testdata/data/baked/props/emoji_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 35u8, 0u8, 0u8, 0u8, 36u8, 0u8, 0u8, 0u8, 42u8, 0u8, 0u8, 0u8, 43u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/epres_v1.rs b/provider/testdata/data/baked/props/epres_v1.rs index f5886bdbf60..d9e1f8bd944 100644 --- a/provider/testdata/data/baked/props/epres_v1.rs +++ b/provider/testdata/data/baked/props/epres_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 26u8, 35u8, 0u8, 0u8, 28u8, 35u8, 0u8, 0u8, 233u8, 35u8, 0u8, 0u8, 237u8, 35u8, diff --git a/provider/testdata/data/baked/props/ext_v1.rs b/provider/testdata/data/baked/props/ext_v1.rs index 89d6f662e11..5709c1dc500 100644 --- a/provider/testdata/data/baked/props/ext_v1.rs +++ b/provider/testdata/data/baked/props/ext_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 183u8, 0u8, 0u8, 0u8, 184u8, 0u8, 0u8, 0u8, 208u8, 2u8, 0u8, 0u8, 210u8, 2u8, diff --git a/provider/testdata/data/baked/props/extpict_v1.rs b/provider/testdata/data/baked/props/extpict_v1.rs index 1836fada381..f836d44ac4a 100644 --- a/provider/testdata/data/baked/props/extpict_v1.rs +++ b/provider/testdata/data/baked/props/extpict_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 169u8, 0u8, 0u8, 0u8, 170u8, 0u8, 0u8, 0u8, 174u8, 0u8, 0u8, 0u8, 175u8, 0u8, diff --git a/provider/testdata/data/baked/props/gr_base_v1.rs b/provider/testdata/data/baked/props/gr_base_v1.rs index a1afc3daf98..b35965104bb 100644 --- a/provider/testdata/data/baked/props/gr_base_v1.rs +++ b/provider/testdata/data/baked/props/gr_base_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 32u8, 0u8, 0u8, 0u8, 127u8, 0u8, 0u8, 0u8, 160u8, 0u8, 0u8, 0u8, 173u8, 0u8, diff --git a/provider/testdata/data/baked/props/gr_ext_v1.rs b/provider/testdata/data/baked/props/gr_ext_v1.rs index d681d4478f8..1afdd2dbdde 100644 --- a/provider/testdata/data/baked/props/gr_ext_v1.rs +++ b/provider/testdata/data/baked/props/gr_ext_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 0u8, 3u8, 0u8, 0u8, 112u8, 3u8, 0u8, 0u8, 131u8, 4u8, 0u8, 0u8, 138u8, 4u8, diff --git a/provider/testdata/data/baked/props/hex_v1.rs b/provider/testdata/data/baked/props/hex_v1.rs index 2c803daf24b..a82dc5643c7 100644 --- a/provider/testdata/data/baked/props/hex_v1.rs +++ b/provider/testdata/data/baked/props/hex_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 48u8, 0u8, 0u8, 0u8, 58u8, 0u8, 0u8, 0u8, 65u8, 0u8, 0u8, 0u8, 71u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/idc_v1.rs b/provider/testdata/data/baked/props/idc_v1.rs index 470708ffe1f..4ddb32222ee 100644 --- a/provider/testdata/data/baked/props/idc_v1.rs +++ b/provider/testdata/data/baked/props/idc_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 48u8, 0u8, 0u8, 0u8, 58u8, 0u8, 0u8, 0u8, 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/ideo_v1.rs b/provider/testdata/data/baked/props/ideo_v1.rs index 3467e2bcde1..b3c70112170 100644 --- a/provider/testdata/data/baked/props/ideo_v1.rs +++ b/provider/testdata/data/baked/props/ideo_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 6u8, 48u8, 0u8, 0u8, 8u8, 48u8, 0u8, 0u8, 33u8, 48u8, 0u8, 0u8, 42u8, 48u8, diff --git a/provider/testdata/data/baked/props/ids_v1.rs b/provider/testdata/data/baked/props/ids_v1.rs index 0b9b7762137..073cd9efdd2 100644 --- a/provider/testdata/data/baked/props/ids_v1.rs +++ b/provider/testdata/data/baked/props/ids_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/idsb_v1.rs b/provider/testdata/data/baked/props/idsb_v1.rs index 02e7a2f9798..bbd383454e1 100644 --- a/provider/testdata/data/baked/props/idsb_v1.rs +++ b/provider/testdata/data/baked/props/idsb_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 240u8, 47u8, 0u8, 0u8, 242u8, 47u8, 0u8, 0u8, 244u8, 47u8, 0u8, 0u8, 252u8, diff --git a/provider/testdata/data/baked/props/idst_v1.rs b/provider/testdata/data/baked/props/idst_v1.rs index 0525472b46f..7d3d6c3e7c9 100644 --- a/provider/testdata/data/baked/props/idst_v1.rs +++ b/provider/testdata/data/baked/props/idst_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 242u8, 47u8, 0u8, 0u8, 244u8, 47u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/join_c_v1.rs b/provider/testdata/data/baked/props/join_c_v1.rs index e3518b2784c..40840341994 100644 --- a/provider/testdata/data/baked/props/join_c_v1.rs +++ b/provider/testdata/data/baked/props/join_c_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 12u8, 32u8, 0u8, 0u8, 14u8, 32u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/loe_v1.rs b/provider/testdata/data/baked/props/loe_v1.rs index b466976e8f9..f54681a1ef1 100644 --- a/provider/testdata/data/baked/props/loe_v1.rs +++ b/provider/testdata/data/baked/props/loe_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 64u8, 14u8, 0u8, 0u8, 69u8, 14u8, 0u8, 0u8, 192u8, 14u8, 0u8, 0u8, 197u8, 14u8, diff --git a/provider/testdata/data/baked/props/lower_v1.rs b/provider/testdata/data/baked/props/lower_v1.rs index 408da33a619..4a1a59877f8 100644 --- a/provider/testdata/data/baked/props/lower_v1.rs +++ b/provider/testdata/data/baked/props/lower_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, 0u8, 170u8, 0u8, 0u8, 0u8, 171u8, 0u8, diff --git a/provider/testdata/data/baked/props/math_v1.rs b/provider/testdata/data/baked/props/math_v1.rs index 35ea26eff76..f22426b632f 100644 --- a/provider/testdata/data/baked/props/math_v1.rs +++ b/provider/testdata/data/baked/props/math_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 43u8, 0u8, 0u8, 0u8, 44u8, 0u8, 0u8, 0u8, 60u8, 0u8, 0u8, 0u8, 63u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/nchar_v1.rs b/provider/testdata/data/baked/props/nchar_v1.rs index e13c16cd8ef..56f2f425428 100644 --- a/provider/testdata/data/baked/props/nchar_v1.rs +++ b/provider/testdata/data/baked/props/nchar_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 208u8, 253u8, 0u8, 0u8, 240u8, 253u8, 0u8, 0u8, 254u8, 255u8, 0u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/pat_syn_v1.rs b/provider/testdata/data/baked/props/pat_syn_v1.rs index 2c4d221cb47..8d3e5d094de 100644 --- a/provider/testdata/data/baked/props/pat_syn_v1.rs +++ b/provider/testdata/data/baked/props/pat_syn_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 33u8, 0u8, 0u8, 0u8, 48u8, 0u8, 0u8, 0u8, 58u8, 0u8, 0u8, 0u8, 65u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/pat_ws_v1.rs b/provider/testdata/data/baked/props/pat_ws_v1.rs index d1ad4990cb9..812e6374d10 100644 --- a/provider/testdata/data/baked/props/pat_ws_v1.rs +++ b/provider/testdata/data/baked/props/pat_ws_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 9u8, 0u8, 0u8, 0u8, 14u8, 0u8, 0u8, 0u8, 32u8, 0u8, 0u8, 0u8, 33u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/qmark_v1.rs b/provider/testdata/data/baked/props/qmark_v1.rs index f2de26ae9bf..d277c2534ea 100644 --- a/provider/testdata/data/baked/props/qmark_v1.rs +++ b/provider/testdata/data/baked/props/qmark_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 34u8, 0u8, 0u8, 0u8, 35u8, 0u8, 0u8, 0u8, 39u8, 0u8, 0u8, 0u8, 40u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/radical_v1.rs b/provider/testdata/data/baked/props/radical_v1.rs index ddcb12c7e3e..52a6b0d7af0 100644 --- a/provider/testdata/data/baked/props/radical_v1.rs +++ b/provider/testdata/data/baked/props/radical_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 128u8, 46u8, 0u8, 0u8, 154u8, 46u8, 0u8, 0u8, 155u8, 46u8, 0u8, 0u8, 244u8, diff --git a/provider/testdata/data/baked/props/ri_v1.rs b/provider/testdata/data/baked/props/ri_v1.rs index 61ddb43b25d..83b7287ce2a 100644 --- a/provider/testdata/data/baked/props/ri_v1.rs +++ b/provider/testdata/data/baked/props/ri_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 230u8, 241u8, 1u8, 0u8, 0u8, 242u8, 1u8, 0u8, diff --git a/provider/testdata/data/baked/props/sd_v1.rs b/provider/testdata/data/baked/props/sd_v1.rs index 14a763be5cb..e90f42a9e1e 100644 --- a/provider/testdata/data/baked/props/sd_v1.rs +++ b/provider/testdata/data/baked/props/sd_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 105u8, 0u8, 0u8, 0u8, 107u8, 0u8, 0u8, 0u8, 47u8, 1u8, 0u8, 0u8, 48u8, 1u8, diff --git a/provider/testdata/data/baked/props/sterm_v1.rs b/provider/testdata/data/baked/props/sterm_v1.rs index c23bc6da96a..9e6e4a96e7b 100644 --- a/provider/testdata/data/baked/props/sterm_v1.rs +++ b/provider/testdata/data/baked/props/sterm_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 33u8, 0u8, 0u8, 0u8, 34u8, 0u8, 0u8, 0u8, 46u8, 0u8, 0u8, 0u8, 47u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/term_v1.rs b/provider/testdata/data/baked/props/term_v1.rs index df2b26659fa..4354694784d 100644 --- a/provider/testdata/data/baked/props/term_v1.rs +++ b/provider/testdata/data/baked/props/term_v1.rs @@ -5,7 +5,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 33u8, 0u8, 0u8, 0u8, 34u8, 0u8, 0u8, 0u8, 44u8, 0u8, 0u8, 0u8, 45u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/uideo_v1.rs b/provider/testdata/data/baked/props/uideo_v1.rs index 33420287abe..72073dbe60b 100644 --- a/provider/testdata/data/baked/props/uideo_v1.rs +++ b/provider/testdata/data/baked/props/uideo_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 0u8, 52u8, 0u8, 0u8, 192u8, 77u8, 0u8, 0u8, 0u8, 78u8, 0u8, 0u8, 0u8, 160u8, diff --git a/provider/testdata/data/baked/props/upper_v1.rs b/provider/testdata/data/baked/props/upper_v1.rs index 16a150775e3..d1636ea6061 100644 --- a/provider/testdata/data/baked/props/upper_v1.rs +++ b/provider/testdata/data/baked/props/upper_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 192u8, 0u8, 0u8, 0u8, 215u8, 0u8, diff --git a/provider/testdata/data/baked/props/vs_v1.rs b/provider/testdata/data/baked/props/vs_v1.rs index e4ec76d4f87..d2aee27d21f 100644 --- a/provider/testdata/data/baked/props/vs_v1.rs +++ b/provider/testdata/data/baked/props/vs_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 11u8, 24u8, 0u8, 0u8, 14u8, 24u8, 0u8, 0u8, 15u8, 24u8, 0u8, 0u8, 16u8, 24u8, diff --git a/provider/testdata/data/baked/props/wspace_v1.rs b/provider/testdata/data/baked/props/wspace_v1.rs index cdd8428b5a1..f719e63d42e 100644 --- a/provider/testdata/data/baked/props/wspace_v1.rs +++ b/provider/testdata/data/baked/props/wspace_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 9u8, 0u8, 0u8, 0u8, 14u8, 0u8, 0u8, 0u8, 32u8, 0u8, 0u8, 0u8, 33u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/xidc_v1.rs b/provider/testdata/data/baked/props/xidc_v1.rs index 91756ab5e65..1008cd0cafc 100644 --- a/provider/testdata/data/baked/props/xidc_v1.rs +++ b/provider/testdata/data/baked/props/xidc_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 48u8, 0u8, 0u8, 0u8, 58u8, 0u8, 0u8, 0u8, 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, diff --git a/provider/testdata/data/baked/props/xids_v1.rs b/provider/testdata/data/baked/props/xids_v1.rs index b2cc573878f..95090d4b60e 100644 --- a/provider/testdata/data/baked/props/xids_v1.rs +++ b/provider/testdata/data/baked/props/xids_v1.rs @@ -6,7 +6,7 @@ pub static DATA: litemap::LiteMap<&str, &DataStruct, &[(&str, &DataStruct)]> = static UND: &DataStruct = &::icu_properties::provider::PropertyCodePointSetV1::InversionList(unsafe { #[allow(unused_unsafe)] - ::icu_uniset::CodePointInversionList::from_parts_unchecked( + ::icu_collections::codepointinvlist::CodePointInversionList::from_parts_unchecked( unsafe { ::zerovec::ZeroVec::from_bytes_unchecked(&[ 65u8, 0u8, 0u8, 0u8, 91u8, 0u8, 0u8, 0u8, 97u8, 0u8, 0u8, 0u8, 123u8, 0u8, 0u8, diff --git a/utils/uniset/Cargo.toml b/utils/uniset/Cargo.toml deleted file mode 100644 index 9d174da15da..00000000000 --- a/utils/uniset/Cargo.toml +++ /dev/null @@ -1,61 +0,0 @@ -# This file is part of ICU4X. For terms of use, please see the file -# called LICENSE at the top level of the ICU4X source tree -# (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ). - -[package] -name = "icu_uniset" -description = "API for highly efficient querying of sets of Unicode characters" -version = "0.5.0" -authors = ["The ICU4X Project Developers"] -edition = "2018" -readme = "README.md" -repository = "https://github.com/unicode-org/icu4x" -license = "Unicode-DFS-2016" -categories = ["internationalization"] -# Keep this in sync with other crates unless there are exceptions -include = [ - "src/**/*", - "examples/**/*", - "benches/**/*", - "tests/**/*", - "Cargo.toml", - "LICENSE", - "README.md" -] - -[package.metadata.cargo-all-features] -skip_optional_dependencies = true -# Bench feature gets tested separately and is only relevant for CI -denylist = ["bench"] - -[package.metadata.docs.rs] -all-features = true - -[dependencies] -serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } -tinystr = { path = "../tinystr", version = "0.6.0", features = ["alloc"], default-features = false } -displaydoc = { version = "0.2.3", default-features = false } -yoke = { version = "0.6.0", path = "../yoke", features = ["derive"] } -zerofrom = { version = "0.1.0", path = "../zerofrom", features = ["derive"] } -zerovec = { version = "0.7", path = "../zerovec", features = ["yoke"] } -databake = { version = "0.1.0", path = "../../utils/databake", features = ["derive"], optional = true } - -[dev-dependencies] -criterion = "0.3.3" -icu_benchmark_macros = { version = "0.6", path = "../../tools/benchmark/macros" } -postcard = { version = "1.0.0-alpha.4", features = ["use-std", "alloc"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" - -[lib] -bench = false # This option is required for Benchmark CI -path = "src/lib.rs" - -[features] -bench = [] -serde = ["dep:serde", "zerovec/serde"] -databake = ["dep:databake", "zerovec/databake"] - -[[bench]] -name = "inv_list" -harness = false