Baked data for icu_plurals, icu_timezone

.github/workflows/build-test.yml

@@ -269,6 +269,8 @@ jobs:
       with:
         key: download-cache
         path: /tmp/icu4x-source-cache
+    - name: Install rustfmt
+      run: rustup component add rustfmt
 
     # Actual job
     - name: Run `cargo make ci-job-full-datagen`

Cargo.toml

@@ -16,9 +16,11 @@ members = [
     "components/locid_transform",
     "components/locid",
     "components/normalizer",
+    "components/plurals/data",
     "components/plurals",
     "components/properties",
     "components/segmenter",
+    "components/timezone/data",
     "components/timezone",
     "experimental/bies",
     "experimental/casemapping",

components/plurals/Cargo.toml

@@ -38,6 +38,8 @@ zerovec = { version = "0.9.4", path = "../../utils/zerovec", features = ["yoke"]
 databake = { version = "0.1.3", path = "../../utils/databake", features = ["derive"], optional = true}
 serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
 
+icu_plurals_data = { version = "43", path = "data", optional = true }
+
 [dev-dependencies]
 criterion = "0.4"
 icu = { path = "../icu" }
@@ -53,6 +55,7 @@ serde = ["dep:serde", "zerovec/serde", "icu_locid/serde", "icu_provider/serde"]
 datagen = ["serde", "zerovec/databake", "dep:databake"]
 experimental = []
 bench = ["serde"]
+data = ["dep:icu_plurals_data"]
 
 [lib]
 path = "src/lib.rs"

components/plurals/data/Cargo.toml

@@ -0,0 +1,28 @@
+# 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_plurals_data"
+version = "43.0.0"
+description = "Data for the icu_plurals crate"
+rust-version = "1.61.0"
+authors = ["The ICU4X Project Developers"]
+edition = "2021"
+readme = "README.md"
+repository = "https://github.com/unicode-org/icu4x"
+homepage = "https://icu4x.unicode.org"
+license = "Unicode-DFS-2016"
+categories = ["internationalization"]
+# Keep this in sync with other crates unless there are exceptions
+include = [
+    "data/**/*",
+    "src/**/*",
+    "examples/**/*",
+    "benches/**/*",
+    "tests/**/*",
+    "Cargo.toml",
+    "LICENSE",
+    "README.md"
+]
+
+[dependencies]

components/plurals/data/LICENSE

@@ -0,0 +1,51 @@
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+See Terms of Use <https://www.unicode.org/copyright.html>
+for definitions of Unicode Inc.’s Data Files and Software.
+
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2022 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
+
+—
+
+Portions of ICU4X may have been adapted from ICU4C and/or ICU4J.
+ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation and others.

components/plurals/data/build.rs

@@ -0,0 +1,12 @@
+// 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 ).
+
+fn main() {
+    if std::env::var("CARGO_FEATURE_DATA").is_ok() {
+        if std::env::var("ICU4X_DATA_DIR").is_ok() {
+            println!("cargo:rustc-cfg=icu4x_custom_data");
+        }
+        println!("cargo:rerun-if-env-changed=ICU4X_DATA_DIR");
+    }
+}

components/plurals/data/config.json

@@ -0,0 +1,24 @@
+{
+    "keys": {
+        "Explicit": [
+            "plurals/ordinal@1",
+            "plurals/cardinal@1"
+        ]
+    },
+    "locales": {
+        "CldrSet": [
+            "modern"
+        ]
+    },
+    "cldr": "Latest",
+    "icu_export": "Latest",
+    "segmenter_lstm": "Latest",
+    "export": {
+        "Baked": {
+            "output_path": "data",
+            "use_separate_crates": true,
+            "pretty": true
+        }
+    },
+    "overwrite": true
+}

components/plurals/data/data/any.rs

@@ -0,0 +1,2 @@
+// @generated
+impl_any_provider!(BakedDataProvider);

components/plurals/data/data/macros.rs

@@ -0,0 +1,59 @@
+// @generated
+#[macro_use]
+#[path = "macros/plurals_cardinal_v1.data.rs"]
+mod plurals_cardinal_v1;
+#[doc(inline)]
+pub use __impl_plurals_cardinal_v1 as impl_plurals_cardinal_v1;
+#[macro_use]
+#[path = "macros/plurals_ordinal_v1.data.rs"]
+mod plurals_ordinal_v1;
+#[doc(inline)]
+pub use __impl_plurals_ordinal_v1 as impl_plurals_ordinal_v1;
+/// Implement [`DataProvider<M>`](icu_provider::DataProvider) on the given struct using the data
+/// hardcoded in this file. This allows the struct to be used with
+/// `icu`'s `_unstable` constructors.
+///
+/// ```compile_fail
+/// struct MyDataProvider;
+/// include!("/path/to/generated/macros.rs");
+/// impl_data_provider(MyDataProvider);
+/// ```
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __impl_data_provider {
+    ($ provider : path) => {
+        impl_plurals_cardinal_v1!($provider);
+        impl_plurals_ordinal_v1!($provider);
+    };
+}
+#[doc(inline)]
+pub use __impl_data_provider as impl_data_provider;
+/// Implement [`AnyProvider`](icu_provider::AnyProvider) on the given struct using the data
+/// hardcoded in this module. This allows the struct to be used with
+/// `icu`'s `_any` constructors.
+///
+/// ```compile_fail
+/// struct MyAnyProvider;
+/// include!("/path/to/generated/macros.rs");
+/// impl_any_provider(MyAnyProvider);
+/// ```
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __impl_any_provider {
+    ($ provider : path) => {
+        #[clippy::msrv = "1.61"]
+        impl icu_provider::AnyProvider for $provider {
+            fn load_any(&self, key: icu_provider::DataKey, req: icu_provider::DataRequest) -> Result<icu_provider::AnyResponse, icu_provider::DataError> {
+                const PLURALS_CARDINAL_V1: icu_provider::DataKeyHash = <icu_plurals::provider::CardinalV1Marker as icu_provider::KeyedDataMarker>::KEY.hashed();
+                const PLURALS_ORDINAL_V1: icu_provider::DataKeyHash = <icu_plurals::provider::OrdinalV1Marker as icu_provider::KeyedDataMarker>::KEY.hashed();
+                match key.hashed() {
+                    PLURALS_CARDINAL_V1 => icu_provider::DataProvider::<icu_plurals::provider::CardinalV1Marker>::load(self, req).and_then(|r| r.take_metadata_and_payload()).map(|(metadata, payload)| icu_provider::AnyResponse { payload: Some(payload.wrap_into_any_payload()), metadata }),
+                    PLURALS_ORDINAL_V1 => icu_provider::DataProvider::<icu_plurals::provider::OrdinalV1Marker>::load(self, req).and_then(|r| r.take_metadata_and_payload()).map(|(metadata, payload)| icu_provider::AnyResponse { payload: Some(payload.wrap_into_any_payload()), metadata }),
+                    _ => Err(icu_provider::DataErrorKind::MissingDataKey.with_req(key, req)),
+                }
+            }
+        }
+    };
+}
+#[doc(inline)]
+pub use __impl_any_provider as impl_any_provider;