Merge branch 'main' into normalizerdata

README.md

@@ -37,12 +37,12 @@ icu = "1.5.0"
 
 ```rust
 use icu::calendar::DateTime;
-use icu::datetime::{DateTimeFormatter, NeoSkeletonLength, fieldset::YMDHMS};
+use icu::datetime::{DateTimeFormatter, NeoSkeletonLength, fieldset::YMDT};
 use icu::locale::locale;
 
 let dtf = DateTimeFormatter::try_new(
     &locale!("es").into(),
-    YMDHMS::long()
+    YMDT::long()
 )
 .expect("locale should be present in compiled data");
 

components/calendar/src/buddhist.rs

@@ -224,6 +224,7 @@ fn iso_year_as_buddhist(year: i32) -> types::YearInfo {
             standard_era: tinystr!(16, "buddhist").into(),
             formatting_era: types::FormattingEra::Index(0, tinystr!(16, "BE")),
             era_year: buddhist_year,
+            ambiguity: types::YearAmbiguity::CenturyRequired,
         },
     )
 }

components/calendar/src/coptic.rs

@@ -313,6 +313,7 @@ fn year_as_coptic(year: i32) -> types::YearInfo {
                 standard_era: tinystr!(16, "coptic").into(),
                 formatting_era: types::FormattingEra::Index(1, tinystr!(16, "AD")),
                 era_year: year,
+                ambiguity: types::YearAmbiguity::CenturyRequired,
             },
         )
     } else {
@@ -322,6 +323,7 @@ fn year_as_coptic(year: i32) -> types::YearInfo {
                 standard_era: tinystr!(16, "coptic-inverse").into(),
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "BD")),
                 era_year: 1 - year,
+                ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
             },
         )
     }

components/calendar/src/ethiopian.rs

@@ -304,6 +304,7 @@ impl Ethiopian {
                     standard_era: tinystr!(16, "ethioaa").into(),
                     formatting_era: types::FormattingEra::Index(0, tinystr!(16, "Anno Mundi")),
                     era_year: year + AMETE_ALEM_OFFSET,
+                    ambiguity: types::YearAmbiguity::CenturyRequired,
                 },
             )
         } else if year > 0 {
@@ -313,6 +314,7 @@ impl Ethiopian {
                     standard_era: tinystr!(16, "ethiopic").into(),
                     formatting_era: types::FormattingEra::Index(2, tinystr!(16, "Incarnation")),
                     era_year: year,
+                    ambiguity: types::YearAmbiguity::CenturyRequired,
                 },
             )
         } else {
@@ -322,6 +324,7 @@ impl Ethiopian {
                     standard_era: tinystr!(16, "ethiopic-inverse").into(),
                     formatting_era: types::FormattingEra::Index(1, tinystr!(16, "Pre-Incarnation")),
                     era_year: 1 - year,
+                    ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
                 },
             )
         }

components/calendar/src/gregorian.rs

@@ -238,6 +238,12 @@ fn year_as_gregorian(year: i32) -> types::YearInfo {
                 standard_era: tinystr!(16, "gregory").into(),
                 formatting_era: types::FormattingEra::Index(1, tinystr!(16, "CE")),
                 era_year: year,
+                ambiguity: match year {
+                    ..=999 => types::YearAmbiguity::EraAndCenturyRequired,
+                    1000..=1949 => types::YearAmbiguity::CenturyRequired,
+                    1950..=2049 => types::YearAmbiguity::Unambiguous,
+                    2050.. => types::YearAmbiguity::CenturyRequired,
+                },
             },
         )
     } else {
@@ -247,6 +253,7 @@ fn year_as_gregorian(year: i32) -> types::YearInfo {
                 standard_era: tinystr!(16, "gregory-inverse").into(),
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "BCE")),
                 era_year: 1_i32.saturating_sub(year),
+                ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
             },
         )
     }

components/calendar/src/hebrew.rs

@@ -344,6 +344,7 @@ impl Hebrew {
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "AM")),
                 standard_era: tinystr!(16, "hebrew").into(),
                 era_year: civil_year,
+                ambiguity: types::YearAmbiguity::CenturyRequired,
             },
         )
     }

components/calendar/src/indian.rs

@@ -240,6 +240,7 @@ fn year_as_saka(year: i32) -> types::YearInfo {
             formatting_era: types::FormattingEra::Index(0, tinystr!(16, "Saka")),
             standard_era: tinystr!(16, "saka").into(),
             era_year: year,
+            ambiguity: types::YearAmbiguity::CenturyRequired,
         },
     )
 }

components/calendar/src/islamic.rs

@@ -61,6 +61,7 @@ fn year_as_islamic(standard_era: tinystr::TinyStr16, year: i32) -> types::YearIn
             formatting_era: types::FormattingEra::Index(0, tinystr!(16, "AH")),
             standard_era: standard_era.into(),
             era_year: year,
+            ambiguity: types::YearAmbiguity::CenturyRequired,
         },
     )
 }

components/calendar/src/iso.rs

@@ -370,6 +370,7 @@ impl Iso {
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "")),
                 standard_era: tinystr!(16, "default").into(),
                 era_year: year,
+                ambiguity: types::YearAmbiguity::Unambiguous,
             },
         )
     }

components/calendar/src/japanese.rs

@@ -278,6 +278,7 @@ impl Calendar for Japanese {
                 formatting_era: types::FormattingEra::Code(date.era.into()),
                 standard_era: date.era.into(),
                 era_year: date.adjusted_year,
+                ambiguity: types::YearAmbiguity::CenturyRequired,
             },
         )
     }
@@ -505,11 +506,6 @@ impl Date<JapaneseExtended> {
             .new_japanese_date_inner(era, year, month, day)?;
         Ok(Date::from_raw(inner, japanext_calendar))
     }
-
-    #[doc(hidden)] // for testing
-    pub fn into_japanese_date(self) -> Date<Japanese> {
-        Date::from_raw(self.inner, self.calendar.0)
-    }
 }
 
 impl DateTime<Japanese> {

components/calendar/src/julian.rs

@@ -228,6 +228,7 @@ fn year_as_julian(year: i32) -> types::YearInfo {
                 standard_era: tinystr!(16, "julian").into(),
                 formatting_era: types::FormattingEra::Index(1, tinystr!(16, "AD")),
                 era_year: year,
+                ambiguity: types::YearAmbiguity::CenturyRequired,
             },
         )
     } else {
@@ -237,6 +238,7 @@ fn year_as_julian(year: i32) -> types::YearInfo {
                 standard_era: tinystr!(16, "julian-inverse").into(),
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "BC")),
                 era_year: 1_i32.saturating_sub(year),
+                ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
             },
         )
     }

components/calendar/src/persian.rs

@@ -228,6 +228,7 @@ impl Persian {
                 standard_era: tinystr!(16, "persian").into(),
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "AH")),
                 era_year: year,
+                ambiguity: types::YearAmbiguity::CenturyRequired,
             },
         )
     }

components/calendar/src/roc.rs

@@ -275,6 +275,7 @@ pub(crate) fn year_as_roc(year: i64) -> types::YearInfo {
                 standard_era: tinystr!(16, "roc").into(),
                 formatting_era: types::FormattingEra::Index(1, tinystr!(16, "ROC")),
                 era_year: year_i32.saturating_sub(ROC_ERA_OFFSET),
+                ambiguity: types::YearAmbiguity::CenturyRequired,
             },
         )
     } else {
@@ -284,6 +285,7 @@ pub(crate) fn year_as_roc(year: i64) -> types::YearInfo {
                 standard_era: tinystr!(16, "roc-inverse").into(),
                 formatting_era: types::FormattingEra::Index(0, tinystr!(16, "B. ROC")),
                 era_year: (ROC_ERA_OFFSET + 1).saturating_sub(year_i32),
+                ambiguity: types::YearAmbiguity::EraAndCenturyRequired,
             },
         )
     }

components/calendar/src/types.rs

@@ -84,6 +84,14 @@ impl YearInfo {
         }
     }
 
+    /// Get the year ambiguity.
+    pub fn year_ambiguity(self) -> YearAmbiguity {
+        match self.kind {
+            YearKind::Cyclic(_) => YearAmbiguity::EraRequired,
+            YearKind::Era(e) => e.ambiguity,
+        }
+    }
+
     /// Get *some* year number that can be displayed
     ///
     /// Gets the eraYear for era dates, otherwise falls back to Extended Year
@@ -123,6 +131,23 @@ impl YearInfo {
     }
 }
 
+/// Defines whether the era or century is required to interpret the year.
+///
+/// For example 2024 AD can be formatted as `2024`, or even `24`, but 1931 AD
+/// should not be formatted as `31`, and 2024 BC should not be formatted as `2024`.
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[allow(clippy::exhaustive_enums)] // logically complete
+pub enum YearAmbiguity {
+    /// The year is unambiguous without a century or era.
+    Unambiguous,
+    /// The century is required, the era may be included.
+    CenturyRequired,
+    /// The era is required, the century may be included.
+    EraRequired,
+    /// The century and era are required.
+    EraAndCenturyRequired,
+}
+
 /// Information about the era as usable for formatting
 ///
 /// This is optimized for storing datetime formatting data.
@@ -146,7 +171,7 @@ pub enum FormattingEra {
 
 impl FormattingEra {
     /// Get a fallback era name suitable for display to the user when the real era name is not availabe
-    pub fn fallback_era(self) -> TinyStr16 {
+    pub fn fallback_name(self) -> TinyStr16 {
         match self {
             Self::Index(_idx, fallback) => fallback,
             Self::Code(era) => era.0,
@@ -172,6 +197,8 @@ pub struct EraYear {
     pub standard_era: Era,
     /// The numeric year in that era
     pub era_year: i32,
+    /// The ambiguity when formatting this year
+    pub ambiguity: YearAmbiguity,
 }
 
 /// Year information for a year that is specified as a cyclic year
@@ -466,6 +493,12 @@ macro_rules! dt_unit {
             pub fn try_sub(self, other: $storage) -> Option<Self> {
                 self.0.checked_sub(other).map(Self)
             }
+
+            /// Returns whether the value is zero.
+            #[inline]
+            pub fn is_zero(self) -> bool {
+                self.0 == 0
+            }
         }
     };
 }

components/calendar/src/week_of.rs

@@ -34,10 +34,6 @@ impl WeekCalculator {
     icu_provider::gen_any_buffer_data_constructors!(
         (locale) -> error: DataError,
         /// Creates a new [`WeekCalculator`] from compiled data.
-        ///
-        /// ✨ *Enabled with the `compiled_data` Cargo feature.*
-        ///
-        /// [📚 Help choosing a constructor](icu_provider::constructors)
     );
 
     #[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::try_new)]

components/collator/Cargo.toml

@@ -22,6 +22,7 @@ all-features = true
 displaydoc = { workspace = true }
 icu_collections = { workspace = true }
 icu_normalizer = { workspace = true }
+icu_locale_core = { workspace = true }
 icu_properties = { workspace = true }
 icu_provider = { workspace = true, features = ["macros"] }
 utf8_iter = { workspace = true }