Merge CLDR, UProps, and Segmenter providers into icu_datagen (#1740)

.gitignore

@@ -22,9 +22,9 @@ dhat-heap.json
 /benchmarks
 
 # Do not check-in binary file tree test data
+provider/datagen/tests/testdata/work_log_bincode
 provider/testdata/data/bincode
 provider/testdata/data/postcard
-tools/datagen/tests/testdata/work_log_bincode
 
 # Ignore irrelevant files that get generated on macOS
 **/.DS_Store

CODEOWNERS

@@ -26,16 +26,14 @@ ffi/cpp/                          @Manishearth
 ffi/ecma402/                      @filmil
 ffi/wasm/                         @Manishearth
 provider/blob/                    @sffc @Manishearth
-provider/cldr/                    @sffc @nordzilla
 provider/core/                    @sffc @Manishearth
+provider/datagen/                 @sffc @robertbastian @Manishearth
 provider/fs/                      @sffc
 provider/macros/                  @Manishearth @sffc
 provider/testdata/                @unicode-org/icu4x-owners
-provider/segmenter/               @aethanyc @makotokato
 tools/benchmark/binsize/          @gnrunge
 tools/benchmark/macros/           @gregtatum
 tools/benchmark/memory/           @gregtatum
-tools/datagen/                    @sffc
 tools/scripts/                    @Manishearth @sffc
 utils/fixed_decimal/              @sffc
 utils/litemap/                    @Manishearth @sffc

Cargo.toml

@@ -27,17 +27,14 @@ members = [
     "ffi/ecma402",
     "provider/adapters",
     "provider/blob",
-    "provider/cldr",
     "provider/core",
+    "provider/datagen",
     "provider/fs",
     "provider/macros",
-    "provider/segmenter",
     "provider/testdata",
-    "provider/uprops",
     "tools/benchmark/macros",
     "tools/benchmark/memory",
     "tools/benchmark/binsize",
-    "tools/datagen",
     "utils/codepointtrie",
     "utils/deduplicating_array",
     "utils/fixed_decimal",

docs/tutorials/writing_a_new_data_struct.md

@@ -55,11 +55,11 @@ Although they may share common code, source data providers are implemented speci
 
 Examples of source data providers include:
 
-- [`CldrJsonDataProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_provider_cldr/transform/struct.CldrJsonDataProvider.html#)
-    - [`NumbersProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_provider_cldr/transform/struct.NumbersProvider.html)
-    - [`PluralsProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_provider_cldr/transform/struct.PluralsProvider.html)
-    - [`DateSymbolsProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_provider_cldr/transform/struct.DateSymbolsProvider.html)
-    - [… more examples](https://unicode-org.github.io/icu4x-docs/doc/icu_provider_cldr/transform/index.html)
+- [`CldrJsonDataProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_datagen/cldr/transform/struct.CldrJsonDataProvider.html#)
+    - [`NumbersProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_datagen/cldr/transform/struct.NumbersProvider.html)
+    - [`PluralsProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_datagen/cldr/transform/struct.PluralsProvider.html)
+    - [`DateSymbolsProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_datagen/cldr/transform/struct.DateSymbolsProvider.html)
+    - [… more examples](https://unicode-org.github.io/icu4x-docs/doc/icu_datagen/cldr/transform/index.html)
 - `BinaryPropertyUnicodeSetDataProvider`
 - [`HelloWorldProvider`](https://unicode-org.github.io/icu4x-docs/doc/icu_provider/hello_world/struct.HelloWorldProvider.html)
 

provider/blob/README.md

@@ -31,7 +31,7 @@ For more examples, see the specific data providers.
 
 [`ICU4X`]: ../icu/index.html
 [`BufferProvider`]: icu_provider::BufferProvider
-[`icu4x-datagen`]: https://github.com/unicode-org/icu4x/tree/main/tools/datagen#readme
+[`icu4x-datagen`]: https://github.com/unicode-org/icu4x/tree/main/provider/datagen#readme
 
 ## More Information
 

provider/blob/src/lib.rs

@@ -33,7 +33,7 @@
 //!
 //! [`ICU4X`]: ../icu/index.html
 //! [`BufferProvider`]: icu_provider::BufferProvider
-//! [`icu4x-datagen`]: https://github.com/unicode-org/icu4x/tree/main/tools/datagen#readme
+//! [`icu4x-datagen`]: https://github.com/unicode-org/icu4x/tree/main/provider/datagen#readme
 
 // https://github.com/unicode-org/icu4x/blob/main/docs/process/boilerplate.md#library-annotations
 #![cfg_attr(not(any(test, feature = "std")), no_std)]

provider/core/README.md

@@ -111,7 +111,7 @@ This trait is normally implemented using the [`impl_dyn_provider!`] macro using
 [`icu_provider_adapters`]: ../icu_provider_adapters/index.html
 [`as_downcasting()`]: AsDowncastingAnyProvider::as_downcasting
 [`as_deserializing()`]: AsDeserializingBufferProvider::as_deserializing
-[`CldrJsonDataProvider`]: ../icu_provider_cldr/struct.CldrJsonDataProvider.html
+[`CldrJsonDataProvider`]: ../icu_datagen/cldr/struct.CldrJsonDataProvider.html
 [`FsDataProvider`]: ../icu_provider_fs/struct.FsDataProvider.html
 [`BlobDataProvider`]: ../icu_provider_blob/struct.BlobDataProvider.html
 

provider/core/src/lib.rs

@@ -113,7 +113,7 @@
 //! [`icu_provider_adapters`]: ../icu_provider_adapters/index.html
 //! [`as_downcasting()`]: AsDowncastingAnyProvider::as_downcasting
 //! [`as_deserializing()`]: AsDeserializingBufferProvider::as_deserializing
-//! [`CldrJsonDataProvider`]: ../icu_provider_cldr/struct.CldrJsonDataProvider.html
+//! [`CldrJsonDataProvider`]: ../icu_datagen/cldr/struct.CldrJsonDataProvider.html
 //! [`FsDataProvider`]: ../icu_provider_fs/struct.FsDataProvider.html
 //! [`BlobDataProvider`]: ../icu_provider_blob/struct.BlobDataProvider.html