Merge branch 'main' into date-skeleton-lookup

components/casemap/tests/conversions.rs

@@ -354,11 +354,11 @@ fn test_greek_upper() {
 
     let assert_greek_uppercase = |input: &str, expected: &str| {
         assert_eq!(
-            cm.uppercase_to_string(nfc.normalize(input).as_str(), modern_greek),
+            cm.uppercase_to_string(nfc.normalize(input).as_ref(), modern_greek),
             nfc.normalize(expected)
         );
         assert_eq!(
-            cm.uppercase_to_string(nfd.normalize(input).as_str(), modern_greek),
+            cm.uppercase_to_string(nfd.normalize(input).as_ref(), modern_greek),
             nfd.normalize(expected)
         );
     };

components/casemap/tests/gen_greek_to_me.rs

@@ -31,8 +31,8 @@ fn main() {
                 if !GeneralCategoryGroup::Letter.contains(gc.get(ch)) {
                     continue;
                 }
-
-                let nfd = decomposer.normalize_utf8(ch.encode_utf8(&mut [0; 4]).as_bytes());
+                let mut buf = [0u8; 4];
+                let nfd = decomposer.normalize_utf8(ch.encode_utf8(&mut buf).as_bytes());
                 let mut data: Option<GreekPrecomposedLetterData> = None;
 
                 for nfd_ch in nfd.chars() {

components/collator/src/comparison.rs

@@ -29,9 +29,9 @@ use crate::provider::CollationTailoringV1Marker;
 use crate::{AlternateHandling, CollatorOptions, MaxVariable, ResolvedCollatorOptions, Strength};
 use core::cmp::Ordering;
 use core::convert::TryFrom;
-use icu_normalizer::provider::CanonicalDecompositionDataV1Marker;
+use icu_normalizer::provider::CanonicalDecompositionDataV2Marker;
 use icu_normalizer::provider::CanonicalDecompositionTablesV1Marker;
-use icu_normalizer::provider::DecompositionDataV1;
+use icu_normalizer::provider::DecompositionDataV2;
 use icu_normalizer::provider::DecompositionTablesV1;
 use icu_normalizer::Decomposition;
 use icu_provider::prelude::*;
@@ -220,7 +220,7 @@ pub struct Collator {
     diacritics: DataPayload<CollationDiacriticsV1Marker>,
     options: CollatorOptionsBitField,
     reordering: Option<DataPayload<CollationReorderingV1Marker>>,
-    decompositions: DataPayload<CanonicalDecompositionDataV1Marker>,
+    decompositions: DataPayload<CanonicalDecompositionDataV2Marker>,
     tables: DataPayload<CanonicalDecompositionTablesV1Marker>,
     lithuanian_dot_above: bool,
 }
@@ -276,7 +276,7 @@ impl Collator {
             + DataProvider<CollationJamoV1Marker>
             + DataProvider<CollationMetadataV1Marker>
             + DataProvider<CollationReorderingV1Marker>
-            + DataProvider<CanonicalDecompositionDataV1Marker>
+            + DataProvider<CanonicalDecompositionDataV2Marker>
             + DataProvider<CanonicalDecompositionTablesV1Marker>
             + ?Sized,
     {
@@ -296,7 +296,7 @@ impl Collator {
     fn try_new_unstable_internal<D>(
         provider: &D,
         root: DataPayload<CollationRootV1Marker>,
-        decompositions: DataPayload<CanonicalDecompositionDataV1Marker>,
+        decompositions: DataPayload<CanonicalDecompositionDataV2Marker>,
         tables: DataPayload<CanonicalDecompositionTablesV1Marker>,
         jamo: DataPayload<CollationJamoV1Marker>,
         special_primaries: impl FnOnce() -> Result<
@@ -364,7 +364,7 @@ pub struct CollatorBorrowed<'a> {
     diacritics: &'a CollationDiacriticsV1<'a>,
     options: CollatorOptionsBitField,
     reordering: Option<&'a CollationReorderingV1<'a>>,
-    decompositions: &'a DecompositionDataV1<'a>,
+    decompositions: &'a DecompositionDataV2<'a>,
     tables: &'a DecompositionTablesV1<'a>,
     lithuanian_dot_above: bool,
 }
@@ -381,7 +381,7 @@ impl CollatorBorrowed<'static> {
 
         let provider = &crate::provider::Baked;
         let decompositions =
-            icu_normalizer::provider::Baked::SINGLETON_CANONICAL_DECOMPOSITION_DATA_V1_MARKER;
+            icu_normalizer::provider::Baked::SINGLETON_CANONICAL_DECOMPOSITION_DATA_V2_MARKER;
         let tables =
             icu_normalizer::provider::Baked::SINGLETON_CANONICAL_DECOMPOSITION_TABLES_V1_MARKER;
         let root = crate::provider::Baked::SINGLETON_COLLATION_ROOT_V1_MARKER;

components/collator/tests/tests.rs

@@ -32,11 +32,11 @@ const _: () = {
 
     icu_normalizer_data::impl_canonical_compositions_v1_marker!(TestingProvider);
     icu_normalizer_data::impl_non_recursive_decomposition_supplement_v1_marker!(TestingProvider);
-    icu_normalizer_data::impl_canonical_decomposition_data_v1_marker!(TestingProvider);
+    icu_normalizer_data::impl_canonical_decomposition_data_v2_marker!(TestingProvider);
     icu_normalizer_data::impl_canonical_decomposition_tables_v1_marker!(TestingProvider);
-    icu_normalizer_data::impl_compatibility_decomposition_supplement_v1_marker!(TestingProvider);
+    icu_normalizer_data::impl_compatibility_decomposition_data_v2_marker!(TestingProvider);
     icu_normalizer_data::impl_compatibility_decomposition_tables_v1_marker!(TestingProvider);
-    icu_normalizer_data::impl_uts46_decomposition_supplement_v1_marker!(TestingProvider);
+    icu_normalizer_data::impl_uts46_decomposition_data_v2_marker!(TestingProvider);
 };
 
 type StackString = arraystring::ArrayString<arraystring::typenum::U32>;

components/datetime/Cargo.toml

@@ -97,7 +97,7 @@ datagen = [
 ]
 logging = ["icu_calendar/logging"]
 experimental = ["dep:litemap"]
-bench = ["serde", "datagen"]
+bench = ["serde", "datagen", "experimental"]
 compiled_data = ["dep:icu_datetime_data", "icu_calendar/compiled_data", "icu_decimal/compiled_data", "icu_plurals/compiled_data", "icu_timezone/compiled_data"]
 
 [lib]

components/datetime/src/error.rs

@@ -30,6 +30,12 @@ pub enum DateTimeFormatterLoadError {
     Data(DataError),
 }
 
+impl From<DataError> for DateTimeFormatterLoadError {
+    fn from(error: DataError) -> Self {
+        Self::Data(error)
+    }
+}
+
 /// An error from mixing calendar types in a formatter.
 #[derive(Display, Debug, Copy, Clone, PartialEq)]
 #[displaydoc("DateTimeFormatter for {this_kind} calendar was given a {date_kind:?} calendar")]