gen

unicode-org · Mar 22, 2024 · bf9ccbe · bf9ccbe
1 parent 848a668
commit bf9ccbe
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 17 deletions.
diff --git a/provider/baked/collator/data/macros/collator_data_v1.rs.data b/provider/baked/collator/data/macros/collator_data_v1.rs.data
diff --git a/provider/baked/collator/data/macros/collator_meta_v1.rs.data b/provider/baked/collator/data/macros/collator_meta_v1.rs.data
diff --git a/provider/baked/collator/data/macros/collator_reord_v1.rs.data b/provider/baked/collator/data/macros/collator_reord_v1.rs.data
diff --git a/provider/baked/locid_transform/data/macros/fallback_supplement_co_v1.rs.data b/provider/baked/locid_transform/data/macros/fallback_supplement_co_v1.rs.data
diff --git a/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs b/provider/datagen/src/transform/cldr/cldr_serde/parent_locales.rs
@@ -9,13 +9,13 @@
 
 use icu_locid::LanguageIdentifier;
 use serde::Deserialize;
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 
 #[derive(PartialEq, Debug, Deserialize)]
 pub struct ParentLocales {
     #[serde(rename = "parentLocale")]
     pub parent_locale: HashMap<LanguageIdentifier, LanguageIdentifier>,
-    pub collations: HashMap<String, LanguageIdentifier>,
+    pub collations: BTreeMap<String, LanguageIdentifier>,
 }
 
 #[derive(PartialEq, Debug, Deserialize)]

diff --git a/provider/datagen/src/transform/icuexport/collator/mod.rs b/provider/datagen/src/transform/icuexport/collator/mod.rs
@@ -23,8 +23,8 @@ use std::collections::HashSet;
 use std::convert::TryFrom;
 use std::str::FromStr;
 use writeable::Writeable;
-use zerovec::ZeroVec;
 use zerovec::ule::UnvalidatedStr;
+use zerovec::ZeroVec;
 
 mod collator_serde;
 
@@ -75,7 +75,6 @@ impl DataProvider<CollationFallbackSupplementV1Marker> for crate::DatagenProvide
     }
 }
 
-
 impl IterableDataProviderInternal<CollationFallbackSupplementV1Marker> for crate::DatagenProvider {
     fn supported_locales_impl(&self) -> Result<HashSet<DataLocale>, DataError> {
         Ok(HashSet::from_iter([Default::default()]))

diff --git a/provider/datagen/tests/data/baked/macros/fallback_supplement_co_v1.rs.data b/provider/datagen/tests/data/baked/macros/fallback_supplement_co_v1.rs.data
diff --git a/provider/datagen/tests/data/json/fallback/supplement/co@1/und.json b/provider/datagen/tests/data/json/fallback/supplement/co@1/und.json
diff --git a/provider/datagen/tests/data/postcard/fingerprints.csv b/provider/datagen/tests/data/postcard/fingerprints.csv
@@ -4948,7 +4948,7 @@ displaynames/variants@1, th, 3709B, ed1d48e400b1c35c
 displaynames/variants@1, tr, 1094B, f75a0ab8f0d0bc98
 fallback/likelysubtags@1, und, 1963B, ea452a518b2defb6
 fallback/parents@1, und, 2553B, 8f3b5fb7bff27d97
-fallback/supplement/co@1, und, 70B, 71e01f2099eca417
+fallback/supplement/co@1, und, 246B, 78151ac4e67429c5
 list/and@1, ar, 18B, 82ed6c556b40aa1e
 list/and@1, ar-EG, 18B, 82ed6c556b40aa1e
 list/and@1, bn, 31B, 19758d48131799f1